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-extended/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-extended/packagegroups')
-rw-r--r-- | poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 12 | ||||
-rw-r--r-- | poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index 9002fbc37..ffa838877 100644 --- a/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -86,10 +86,8 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\ mc-fish \ mc-helpers \ mc-helpers-perl \ - mktemp \ ncurses \ net-tools \ - popt \ procps \ psmisc \ sed \ @@ -127,25 +125,17 @@ RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\ " RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ + bzip2 \ cracklib \ gzip \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \ shadow \ sudo \ " RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\ at \ - bzip2 \ cronie \ - dbus \ - elfutils \ - gzip \ - less \ logrotate \ nfs-utils \ - pciutils \ rpcbind \ - tcp-wrappers \ - tzdata \ " diff --git a/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 53d100ce7..e8dc42159 100644 --- a/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -76,7 +76,7 @@ RDEPENDS_packagegroup-core-sys-extended = "\ screen \ setserial \ sysstat \ - udev-extraconf \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'udev-extraconf', d)} \ unzip \ watchdog \ wget \ @@ -136,6 +136,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ bc \ binutils \ binutils-symlinks \ + bzip2 \ coreutils \ cpio \ cronie \ @@ -158,7 +159,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\ make \ man \ man-pages \ - mktemp \ msmtp \ patch \ procps \ @@ -220,7 +220,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ liberation-fonts \ gtk+ \ atk \ - libasound \ + alsa-lib \ " RDEPENDS_packagegroup-core-lsb-runtime-add = "\ |