summaryrefslogtreecommitdiffstats
path: root/meta/conf/layer.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/layer.conf')
-rw-r--r--meta/conf/layer.conf47
1 files changed, 43 insertions, 4 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 24b4df07f5..fcdf9ae5a3 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -7,9 +7,12 @@ BBFILE_COLLECTIONS += "core"
BBFILE_PATTERN_core = "^${LAYERDIR}/"
BBFILE_PRIORITY_core = "5"
+LAYERSERIES_CORENAMES = "zeus"
+
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
-LAYERVERSION_core = "9"
+LAYERVERSION_core = "11"
+LAYERSERIES_COMPAT_core = "warrior zeus"
BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
@@ -19,6 +22,7 @@ COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
# opkg-utils is for update-alternatives :(
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
sysvinit-inittab \
+ busybox-inittab \
shadow-securetty \
opkg-arch-config \
netbase \
@@ -38,24 +42,59 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
base-passwd \
opkg-utils \
gstreamer1.0-meta-base \
+ ca-certificates \
"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
- gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \
+ *->quilt-native \
+ *->subversion-native \
+ *->git-native \
+ *->icecc-create-env-native \
gcc-cross-${TARGET_ARCH}->linux-libc-headers \
ppp-dialin->ppp \
resolvconf->bash \
docbook-xsl-stylesheets->perl \
ca-certificates->openssl \
initramfs-framework->${VIRTUAL-RUNTIME_base-utils} \
- initramfs-framework->systemd \
initramfs-framework->eudev \
+ initramfs-framework->systemd \
+ initramfs-module-install-efi->dosfstools \
+ initramfs-module-install-efi->e2fsprogs \
+ initramfs-module-install-efi->parted \
+ initramfs-module-install-efi->util-linux \
+ initramfs-module-install->e2fsprogs \
+ initramfs-module-install->grub \
+ initramfs-module-install->parted \
+ initramfs-module-install->util-linux \
+ grub-efi->grub-bootconf \
liberation-fonts->fontconfig \
cantarell-fonts->fontconfig \
gnome-icon-theme->librsvg \
font-alias->font-util \
+ systemd-boot->systemd-bootconf \
+ systemd->systemd-conf \
+ weston->weston-init \
weston-init->weston \
weston-init->kbd \
- oprofile->virtual/kernel \
+ connman->xl2tpd \
+ lttng-tools->lttng-modules \
+"
+
+# 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}"