From b75c618de85e674b60f0f054b9e9b11577db5483 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Mon, 7 Oct 2019 15:42:49 +0200 Subject: nvme-cli: upgrade 1.6 -> 1.9 Signed-off-by: Stefan Wiehler Signed-off-by: Khem Raj --- ...Makefile-fix-bash-completion-install-path.patch | 33 ---------------------- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb | 21 -------------- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 29 +++++++++++++++++++ 3 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch delete mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb create mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb diff --git a/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch b/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch deleted file mode 100644 index 154e1401a3..0000000000 --- a/meta-oe/recipes-bsp/nvme-cli/files/0001-Makefile-fix-bash-completion-install-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef64032b34190079aab591c64a25f7535a977390 Mon Sep 17 00:00:00 2001 -From: Stefan Wiehler -Date: Tue, 9 Oct 2018 11:26:34 +0200 -Subject: [PATCH] Makefile: fix bash completion install path - -Change path to bash-completion upstream recommendation used by most -distributions. - -Upstream-Status: Accepted - -Signed-off-by: Stefan Wiehler ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index fa587dd..433bc41 100644 ---- a/Makefile -+++ b/Makefile -@@ -69,8 +69,8 @@ install-bin: default - $(INSTALL) -m 755 nvme $(DESTDIR)$(SBINDIR) - - install-bash-completion: -- $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash_completion.d -- $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash_completion.d/nvme -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions -+ $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/nvme - - install: install-bin install-man install-bash-completion - --- -1.9.1 - diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb deleted file mode 100644 index 9b7e6cd4de..0000000000 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "NVMe management command line interface" -AUTHOR = "Stefan Wiehler " -HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ - file://0001-Makefile-fix-bash-completion-install-path.patch \ - " -SRCREV = "642d426faf8a67ed01e90f7c35c0d967f8cc52a3" - -S = "${WORKDIR}/git" - -inherit bash-completion - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb new file mode 100644 index 0000000000..256d83f039 --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb @@ -0,0 +1,29 @@ +SUMMARY = "NVMe management command line interface" +AUTHOR = "Stefan Wiehler " +HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" +DEPENDS = "util-linux util-linux-native" +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" +SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" + +S = "${WORKDIR}/git" + +inherit bash-completion systemd + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} +} + +pkg_postinst_ontarget_${PN}() { + ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn +} + +PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" + +FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" -- cgit 1.2.3-korg