diff options
Diffstat (limited to 'meta-oe/conf/layer.conf')
| -rw-r--r-- | meta-oe/conf/layer.conf | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 23c10ce339..923b722b3c 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -5,7 +5,7 @@ # Therefore if you want a given layer to be considered high priority # for the .inc and .conf etc. then consider it adding at the beginning # of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve -# the recipe contention so the order of directories in BBFILES does +# the recipe contention so the order of directories in BBFILES does # not matter. # We have a conf and classes directory, append to BBPATH @@ -21,7 +21,22 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" # choosing carefully how this layer interacts with all of the # other layers. -BBFILE_PRIORITY_openembedded-layer = "6" +BBFILE_PRIORITY_openembedded-layer = "5" + +# 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 \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bb \ + networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bbappend \ + gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/recipes-*/*/*.bb \ + gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/recipes-*/*/*.bbappend \ + perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \ + perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bbappend \ + selinux:${LAYERDIR}/dynamic-layers/selinux/recipes-*/*/*.bb \ + selinux:${LAYERDIR}/dynamic-layers/selinux/recipes-*/*/*.bbappend \ +" # This should only be incremented on significant changes that will # cause compatibility issues with other layers @@ -29,12 +44,18 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "thud" +LAYERSERIES_COMPAT_openembedded-layer = "mickledore" LICENSE_PATH += "${LAYERDIR}/licenses" +PREFERRED_RPROVIDER_libdevmapper = "lvm2" +PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" +# Configures whether coreutils or uutils-coreutils is used. +PREFERRED_PROVIDER_coreutils = "coreutils" +PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" +PREFERRED_RPROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" + SIGGEN_EXCLUDERECIPES_ABISAFE += " \ - mplayer-common \ fbset-modes \ gpsd-machine-conf \ distro-feed-configs \ @@ -47,8 +68,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 @@ -61,13 +87,17 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-gentium->fontconfig \ ttf-hunkyfonts->fontconfig \ ttf-inconsolata->fontconfig \ + ttf-ipa->fontconfig \ ttf-liberation->fontconfig \ 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 \ ttf-sazanami->fontconfig \ + ttf-takao->fontconfig \ ttf-tlwg->fontconfig \ ttf-ubuntu-font-family->fontconfig \ ttf-vlgothic->fontconfig \ @@ -76,6 +106,9 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ source-han-sans-jp-fonts->fontconfig \ source-han-sans-kr-fonts->fontconfig \ source-han-sans-tw-fonts->fontconfig \ + source-code-pro-fonts->fontconfig \ " -DEFAULT_TEST_SUITES_pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" +DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" + +NON_MULTILIB_RECIPES:append = " crash pahole" |