From b594d936b18b4cdbb0d0c63894e34509d99b974a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 20 Nov 2022 13:37:35 -0500 Subject: Handle upstream TEMPLATECONF change oe-core now requires that TEMPLATECONF point at conf/templates/* inside a layer, tweak things to move the base template files into meta-agl-core to match its expectations. Bug-AGL: SPEC-4578 Change-Id: Idb0af9b4bd6bc55b9fb2cb50a675e928e7c2b025 Signed-off-by: Scott Murray --- templates/base/bblayers.conf.sample | 74 ------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 templates/base/bblayers.conf.sample (limited to 'templates/base/bblayers.conf.sample') diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample deleted file mode 100644 index e3c5fcc65..000000000 --- a/templates/base/bblayers.conf.sample +++ /dev/null @@ -1,74 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "6" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -# Convenience variables usable in various configuration fragments -#---------------------------------- -BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}" -METADIR := "${@os.path.abspath('##OEROOT##/../..')}" - -# These are the core OE + YP Layers -#---------------------------------- -YOCTO_LAYERS = " \ - ${METADIR}/external/poky/meta \ - ${METADIR}/external/poky/meta-poky \ - ${METADIR}/external/meta-lts-mixins_rust \ - " -# this is added for the boards where necessary, not globally -# ${METADIR}/external/poky/meta-yocto-bsp \ -# -# These are the AGL CORE Layers that make up the basis -# - they create a minimal bootable filesystem -# with some automotive tools/libraries -#----------------------------------------------------- -AGL_CORE_LAYERS = " \ - ${METADIR}/meta-agl/meta-agl-core \ - ${METADIR}/meta-agl/meta-agl-bsp \ - " - -# These are the direct dependencies of the AGL CORE Layers -#--------------------------------------------------------- -AGL_CORE_DEPENDENCY_LAYERS = " \ - ${METADIR}/external/meta-openembedded/meta-oe \ - " - -# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS -# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base -AGL_META_NETWORKING ?= "" -AGL_META_PYTHON ?= "" -AGL_META_FILESYSTEMS ?= "" -AGL_META_MULTIMEDIA ?= "" -AGL_META_VIRTUALIZATION ?= "" -AGL_META_CLANG ?= "" -AGL_META_QT5 ?= "" - -AGL_OTHER_DEPENDENCY_LAYERS = " \ - ${AGL_META_NETWORKING} \ - ${AGL_META_PYTHON} \ - ${AGL_META_FILESYSTEMS} \ - ${AGL_META_MULTIMEDIA} \ - ${AGL_META_VIRTUALIZATION} \ - ${AGL_META_CLANG} \ - ${AGL_META_QT5} \ - " - -#################### -# Combine the layers -BBLAYERS ?= " \ - ${AGL_OTHER_DEPENDENCY_LAYERS} \ - ${AGL_CORE_DEPENDENCY_LAYERS} \ - ${AGL_CORE_LAYERS} \ - ${YOCTO_LAYERS} \ - " - -BBLAYERS_NON_REMOVABLE ?= " \ - ${METADIR}/external/poky/meta \ - ${METADIR}/external/poky/meta-poky \ - ${METADIR}/meta-agl/meta-agl-core \ - " - - - -- cgit 1.2.3-korg