From a857b0b23a64a8cf209dc35c4773d22ab236162d Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 11 Jan 2021 13:19:09 +0100 Subject: Fix agl-appfw-smack and agl-netboot dependency issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both layers need meta-python and meta-networking. But adding them to BBLAYERS twice will cause a duplicate inclusion error. Conditionals do not work out at this stage yet nicely, thus we use an empty variable as indirection to only include it once. (Kudos to Paul for the idea.) Adapt bblayers.conf.sample, agl-appfw-smack and agl-netboot features. This is the necessary follow-up to https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25844 and fixes the issue raised. Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Möller Change-Id: I74e27b8a6e1f1a68ed370e01c2f2d406841873c8 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25881 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- templates/base/bblayers.conf.sample | 10 ++++++++++ templates/feature/agl-appfw-smack/50_bblayers.conf.inc | 9 ++++++--- templates/feature/agl-netboot/50_bblayers.conf.inc | 5 +++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample index 0dd28da03..82ab42d67 100644 --- a/templates/base/bblayers.conf.sample +++ b/templates/base/bblayers.conf.sample @@ -35,9 +35,19 @@ 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_OTHER_DEPENDENCY_LAYERS = " \ + ${AGL_META_NETWORKING} \ + ${AGL_META_PYTHON} \ + " + #################### # Combine the layers BBLAYERS ?= " \ + ${AGL_OTHER_DEPENDENCY_LAYERS} \ ${AGL_CORE_DEPENDENCY_LAYERS} \ ${AGL_CORE_LAYERS} \ ${YOCTO_LAYERS} \ diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc index 5f6847a87..2e79797e8 100644 --- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc +++ b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc @@ -1,9 +1,12 @@ AGL_APPFW_LAYERS = " \ ${METADIR}/external/meta-security \ - ${METADIR}/external/meta-openembedded/meta-python \ - ${METADIR}/external/meta-openembedded/meta-networking \ ${METADIR}/external/meta-openembedded/meta-perl \ ${METADIR}/meta-agl/meta-app-framework \ " -BBLAYERS =+ "${AGL_APPFW_LAYERS}" \ No newline at end of file +BBLAYERS =+ "${AGL_APPFW_LAYERS}" + +# 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_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc index 80ace82d4..7cbff1662 100644 --- a/templates/feature/agl-netboot/50_bblayers.conf.inc +++ b/templates/feature/agl-netboot/50_bblayers.conf.inc @@ -1,2 +1,7 @@ BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \ " + +# 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_PYTHON = "${METADIR}/external/meta-openembedded/meta-python" +AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking" -- cgit 1.2.3-korg