nvme-cli: Use install-spec target
PATCH 1/1 nvme-cli: Use install-spec target
install target build install-hostparams as well, which tries to run nvme tool during build, we defer that to runtime post_install anyway so we can ignore building it during install task
--- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +1 -1
@@ -15,7 +15,7 @@ S = "${WORKDIR}/git" inherit bash-completion systemd do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} }
Signature · 1 line
2.23.0
PATCH 1/1 nvme-cli: defer host ID generation to post installation
Right now, we only generate the hostnqn post-installation, but not the hostid; I agree however that it makes more sense to perform both tasks on the target.
PATCH 1/1 nvme-cli: defer host ID generation to post installation
--- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +5 -2
@@ -4,7 +4,7 @@ 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" +DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"
@@ -15,15 +15,18 @@ S = "${WORKDIR}/git" inherit bash-completion systemd do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} } pkg_postinst_ontarget_${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen"
Signature · 1 line
2.19.2
Re: [meta-oe][PATCH] nvme-cli: defer host ID generation to post installation
Stefan
Please rebase it on top of latest master and resend please. Since half of this patch is already merged.
Quoted 45 lines · Stefan Wiehler
Signed-off-by: Stefan Wiehler <
[email protected]>--- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)meta- renamed from meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +0
-0oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb
index256d83f03..061c7a0fe100644meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +0
-0@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM ="file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022"
meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +5
-2-DEPENDS = "util-linux util-linux-native" +DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"@@ -15,15 +15,18 @@ S = "${WORKDIR}/git" inherit bash-completion systemd do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} \ + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} } pkg_postinst_ontarget_${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen"Signature · 1 line
2.19.2
PATCH v2 1/1 nvme-cli: defer host ID generation to post installation
--- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +4 -1
@@ -4,7 +4,7 @@ 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" +DEPENDS = "util-linux" PV .= "+git${SRCPV}" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"
@@ -21,6 +21,7 @@ do_install() { pkg_postinst_ontarget_${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion"
@@ -28,3 +29,5 @@ PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen"
Signature · 1 line
2.19.2