diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-core/packagegroups | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/packagegroups')
8 files changed, 24 insertions, 13 deletions
diff --git a/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index e2f616999..4bf0ac045 100644 --- a/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -21,10 +21,11 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ nativesdk-shadow \ nativesdk-makedevs \ - nativesdk-dnf \ nativesdk-cmake \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \ nativesdk-sdk-provides-dummy \ + nativesdk-bison \ + nativesdk-flex \ " RDEPENDS_${PN}_darwin = "\ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb index bb192aed2..442201c9e 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -289,7 +289,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\ # SUMMARY_packagegroup-base-wifi = "WiFi support" RDEPENDS_packagegroup-base-wifi = "\ - ${VIRTUAL-RUNTIME_wireless-tools} \ + iw \ wpa-supplicant" RRECOMMENDS_packagegroup-base-wifi = "\ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 76cd7fc4e..8dc445dc8 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -46,4 +46,5 @@ RDEPENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" RRECOMMENDS_${PN} = "\ + ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 43fc599c7..f5b2d69ce 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} = "\ ${LIBC_DEPENDENCIES} \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS_${PN}_mingw32 = "\ libssp \ libssp-dev \ " diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index fa0e363d8..33d9c09a6 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -18,7 +18,6 @@ PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'sys RRECOMMENDS_${PN} = "\ ${PERF} \ - trace-cmd \ blktrace \ ${PROFILE_TOOLS_X} \ ${PROFILE_TOOLS_SYSTEMD} \ @@ -34,6 +33,7 @@ PERF_libc-musl = "" SYSTEMTAP = "systemtap" SYSTEMTAP_libc-musl = "" SYSTEMTAP_nios2 = "" +SYSTEMTAP_riscv64 = "" # lttng-ust uses sched_getcpu() which is not there on for some platforms. LTTNGUST = "lttng-ust" @@ -45,6 +45,7 @@ LTTNGTOOLS_libc-musl = "" LTTNGTOOLS_riscv64 = "" LTTNGMODULES = "lttng-modules" +LTTNGMODULES_riscv64 = "" BABELTRACE = "babeltrace" @@ -54,12 +55,15 @@ VALGRIND = "valgrind" VALGRIND_libc-musl = "" VALGRIND_mipsarch = "" VALGRIND_nios2 = "" +VALGRIND_arc = "" VALGRIND_armv4 = "" VALGRIND_armv5 = "" VALGRIND_armv6 = "" VALGRIND_armeb = "" VALGRIND_aarch64 = "" +VALGRIND_riscv64 = "" VALGRIND_linux-gnux32 = "" +VALGRIND_linux-gnun32 = "" RDEPENDS_${PN} = "\ ${PROFILETOOLS} \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index b8e507073..643219852 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -15,6 +15,10 @@ KEXECTOOLS ?= "kexec" KEXECTOOLS_e5500-64b ?= "" KEXECTOOLS_microblaze ?= "" KEXECTOOLS_nios2 ?= "" +KEXECTOOLS_riscv64 ?= "" + +GSTEXAMPLES ?= "gst-examples" +GSTEXAMPLES_riscv64 = "" X11GLTOOLS = "\ mesa-demos \ @@ -25,8 +29,7 @@ X11GLTOOLS = "\ " X11TOOLS = "\ - fstests \ - gst-examples \ + ${GSTEXAMPLES} \ x11perf \ xrestop \ xwininfo \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb index 7d2ccbda2..5afb490aa 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -7,3 +7,5 @@ RDEPENDS_${PN} = " \ go-runtime-dev \ go-runtime-staticdev \ " + +COMPATIBLE_HOST = "^(?!riscv64).*" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index adb0c56c3..9a6721ce0 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -76,24 +76,26 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ intltool \ ldd \ less \ - libssp \ - libssp-dev \ - libssp-staticdev \ libstdc++ \ libstdc++-dev \ libtool \ make \ - mktemp \ perl-module-re \ perl-module-text-wrap \ pkgconfig \ quilt \ sed \ " -# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ + libssp \ + libssp-dev \ + libssp-staticdev \ + " +# rpcsvc-proto: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ glibc-gconv-ibm850 \ glibc-utils \ + rpcsvc-proto \ " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ @@ -185,8 +187,6 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\ libgl-dev \ libglu \ libglu-dev \ - libsdl \ - libsdl-dev \ libx11-dev \ adwaita-icon-theme \ xdg-utils \ |