From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../nvme-cli/0001-fix-musl-compilation.patch | 26 ++++++++++++++++ .../recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb | 35 ++++++++++++++++++++++ .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 33 -------------------- 3 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb (limited to 'meta-openembedded/meta-oe/recipes-bsp/nvme-cli') diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch new file mode 100644 index 0000000000..be5d0dac79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch @@ -0,0 +1,26 @@ +From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 +From: Neel Chotai +Date: Fri, 14 Feb 2020 17:56:23 +0000 +Subject: [PATCH] fix musl compilation + +Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] +Signed-off-by: Pierre-Jean Texier +--- + plugins/micron/micron-nvme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c +index 8240887..165fcf0 100644 +--- a/plugins/micron/micron-nvme.c ++++ b/plugins/micron/micron-nvme.c +@@ -13,6 +13,7 @@ + #include "nvme-print.h" + #include "nvme-ioctl.h" + #include ++#include + + #define CREATE_CMD + #include "micron-nvme.h" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb new file mode 100644 index 0000000000..4f4bb2dfab --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb @@ -0,0 +1,35 @@ +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-fix-musl-compilation.patch \ +" +SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" + +S = "${WORKDIR}/git" + +inherit bash-completion systemd + +do_install() { + 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} += "${systemd_system_unitdir}" +FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb deleted file mode 100644 index ea8bc1738e..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ /dev/null @@ -1,33 +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" -SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" - -S = "${WORKDIR}/git" - -inherit bash-completion systemd - -do_install() { - 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} += "${systemd_system_unitdir}" -FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS_${PN} = "util-linux-uuidgen" -- cgit v1.2.3