From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-extended/hwloc/hwloc_1.11.10.bb | 31 ++++++++++++++++++++++ .../meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb | 29 -------------------- 2 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb (limited to 'meta-openembedded/meta-oe/recipes-extended/hwloc') diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb new file mode 100644 index 000000000..5f4155ea5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.10.bb @@ -0,0 +1,31 @@ +SUMMARY = "Portable Hardware Locality (hwloc) software package" +DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ + provides a portable abstraction of the hierarchical topology of modern \ + architectures." +HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" +SECTION = "base" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" + +SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2" +SRC_URI[md5sum] = "0981a01935982aa7e850a96e0c3057b0" +SRC_URI[sha256sum] = "2be808383d8337846fe77ce49c7ad3336fb6857505494d85c0ac03f22c5bd1e7" + +UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" + +inherit autotools pkgconfig + +DEPENDS += "ncurses udev zlib" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +PACKAGECONFIG ?= "pci libxml2 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +PACKAGECONFIG[numactl] = "--enable-libnuma,--disable-libnuma,numactl,numactl" +PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2,libxml2" +PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" +PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" + +# Split hwloc library into separate subpackage +PACKAGES_prepend = " libhwloc " +FILES_libhwloc += "${libdir}/libhwloc.so.*" +RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb deleted file mode 100644 index 5a335b924..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Portable Hardware Locality (hwloc) software package" -DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ - provides a portable abstraction of the hierarchical topology of modern \ - architectures." -HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" -SECTION = "base" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" - -SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "96c34136ff416d2b13a7821c27477bed" -SRC_URI[sha256sum] = "95d80286dfe658a3f79e2ac90698782bb36e5504f4bac1bba2394ba14dbbad24" - -inherit autotools pkgconfig - -DEPENDS += "ncurses udev zlib" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -PACKAGECONFIG ?= "pci libxml2 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -PACKAGECONFIG[numactl] = "--enable-libnuma,--disable-libnuma,numactl,numactl" -PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2,libxml2" -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" -PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" - -# Split hwloc library into separate subpackage -PACKAGES_prepend = " libhwloc " -FILES_libhwloc += "${libdir}/libhwloc.so.*" -RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" -- cgit v1.2.3