diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
| commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
| tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/conf/layer.conf | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz | |
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 <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/conf/layer.conf')
| -rw-r--r-- | meta-openembedded/meta-oe/conf/layer.conf | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index bad87850e9..adcec83029 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -23,13 +23,20 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openembedded-layer = "6" +# only activates content when identified layers are present, +# to ensure yocto compatibility check pass +BBFILES_DYNAMIC += " \ +meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ +perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \ +" + # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" @@ -49,11 +56,13 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ usb-modeswitch-data->usb-modeswitch \ lmsensors->lmsensors-config \ phoronix-test-suite->bash \ - phoronix-test-suite->python \ + phoronix-test-suite->python3 \ phoronix-test-suite->php \ phoronix-test-suite->lsb-release \ phoronix-test-suite->util-linux \ phoronix-test-suite->busybox \ + phoronix-test-suite->shared-mime-info \ + phoronix-test-suite->desktop-file-utils \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS @@ -70,6 +79,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-liberation-sans-narrow->fontconfig \ ttf-lklug->fontconfig \ ttf-lohit->fontconfig \ + ttf-noto-emoji->fontconfig \ ttf-pt-sans->fontconfig \ ttf-roboto->fontconfig \ ttf-mplus->fontconfig \ |