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/conf/layer.conf | |
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/conf/layer.conf')
-rw-r--r-- | poky/meta/conf/layer.conf | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/poky/meta/conf/layer.conf b/poky/meta/conf/layer.conf index 315fb936f..c67dec49e 100644 --- a/poky/meta/conf/layer.conf +++ b/poky/meta/conf/layer.conf @@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" -LAYERSERIES_CORENAMES = "sumo" +LAYERSERIES_CORENAMES = "thud" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_core = "11" -LAYERSERIES_COMPAT_core = "sumo" +LAYERSERIES_COMPAT_core = "thud" BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" @@ -74,9 +74,27 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ gnome-icon-theme->librsvg \ font-alias->font-util \ systemd-boot->systemd-bootconf \ + systemd->systemd-conf \ + weston->weston-conf \ weston-init->weston \ weston-init->kbd \ " +# Avoid adding bison-native to the sysroot without a specific +# dependency in the recipe. This means indirect dependencies +# (e.g. X -> Y -> binutils-cross -> bison-native) no longer meet the +# dependency incidentally. This improves determinism and avoids build +# failures when people switch to external toolchains. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native" +# Nothing needs to depend on libc-initial/gcc-cross-initial +# base-passwd/shadow-sysroot don't need their dependencies +SSTATE_EXCLUDEDEPS_SYSROOT += "\ + .*->.*-initial.* \ + .*(base-passwd|shadow-sysroot)->.* \ +" +# Avoid adding autoconf-archive-native to sysroot without a specific +# dependency in the recipe. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" + # We need to keep bitbake tools in PATH PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" |