diff options
Diffstat (limited to 'meta/conf/layer.conf')
| -rw-r--r-- | meta/conf/layer.conf | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 098ef12ac6..f2bca0aa5b 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" -LAYERSERIES_CORENAMES = "dunfell gatesgarth" +LAYERSERIES_CORENAMES = "scarthgap styhead" # This should only be incremented on significant changes that will # cause compatibility issues with other layers -LAYERVERSION_core = "12" -LAYERSERIES_COMPAT_core = "gatesgarth" +LAYERVERSION_core = "15" +LAYERSERIES_COMPAT_core = "styhead" BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" @@ -48,6 +48,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + *->patch-native \ *->quilt-native \ *->subversion-native \ *->git-native \ @@ -68,9 +69,11 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ initramfs-module-install->grub \ initramfs-module-install->parted \ initramfs-module-install->util-linux \ + initramfs-module-setup-live->udev-extraconf \ grub-efi->grub-bootconf \ liberation-fonts->fontconfig \ cantarell-fonts->fontconfig \ + ttf-bitstream-vera->fontconfig \ gnome-icon-theme->librsvg \ font-alias->font-util \ systemd-boot->systemd-bootconf \ @@ -80,6 +83,11 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ weston-init->kbd \ connman->xl2tpd \ lttng-tools->lttng-modules \ + sato-icon-theme->gdk-pixbuf \ + sato-icon-theme->gtk+3 \ + adwaita-icon-theme->gdk-pixbuf \ + adwaita-icon-theme->gtk+3 \ + run-postinsts->util-linux \ " # Avoid adding bison-native to the sysroot without a specific @@ -87,8 +95,25 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ # (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 +# libarchive only needs e2fsprogs headers at buildtime +SSTATE_EXCLUDEDEPS_SYSROOT += "\ + .*->autoconf-native \ + .*->automake-native \ + .*->bison-native \ + .*->meson-native \ + .*->ninja-native \ + .*->patch-native \ + .*->pkgconfig-native \ + .*->quilt-native \ + ^(?!gtk-doc-native).*->xmlto-native \ + .*->gperf-native \ + .*->help2man-native \ + .*->gtk-doc-native \ + .*->texinfo-native \ + .*->perlcross-native \ + libarchive-native->e2fsprogs-native \ +" +# Nothing needs to depend on libc-initial # base-passwd/shadow-sysroot don't need their dependencies SSTATE_EXCLUDEDEPS_SYSROOT += "\ .*->.*-initial.* \ @@ -99,4 +124,11 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\ 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}" +# Avoid empty path entries +BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}" +PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' != '' else ''}${HOSTTOOLS_DIR}" + +# Only OE-Core should set/change this +BB_GLOBAL_PYMODULES = "os sys time" + +addpylib ${LAYERDIR}/lib oe |