From 13535294f65ee5e05077c310c2b96522d8844357 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 30 Apr 2020 14:51:03 +0100 Subject: [PATCH] Have meta-arm-bsp specific bbappends as BBFILES_DYNAMIC The boot-wrapper-aarch64_%.bbappend and firmware-image-juno.bbappend should be only considered when meta-arm-bsp layer is present. Change-Id: Id66a989820675a281946a26b9afec6d5b3d29bca Issue-Id: SCM-984 Signed-off-by: Diego Sueiro Reviewed-by: Bertrand Marquis Signed-off-by: Jon Mason --- meta-arm-autonomy/conf/layer.conf | 3 +++ .../boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend | 0 .../recipes-bsp/images/firmware-image-juno.bbappend | 0 .../recipes-bsp/images/firmware-image-juno/images-r0.txt | 0 .../recipes-bsp/images/firmware-image-juno/images-r1.txt | 0 .../recipes-bsp/images/firmware-image-juno/images-r2.txt | 0 .../recipes-bsp/images/firmware-image-juno/uEnv.txt | 0 7 files changed, 3 insertions(+) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend (100%) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/images/firmware-image-juno.bbappend (100%) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/images/firmware-image-juno/images-r0.txt (100%) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/images/firmware-image-juno/images-r1.txt (100%) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/images/firmware-image-juno/images-r2.txt (100%) rename meta-arm-autonomy/{ => dynamic-layers/meta-arm-bsp}/recipes-bsp/images/firmware-image-juno/uEnv.txt (100%) diff --git a/meta-arm-autonomy/conf/layer.conf b/meta-arm-autonomy/conf/layer.conf index 19f24add..8ee9ce60 100644 --- a/meta-arm-autonomy/conf/layer.conf +++ b/meta-arm-autonomy/conf/layer.conf @@ -29,3 +29,6 @@ ARM_AUTONOMY_DISTRO_CFGDIR = "${LAYERDIR}/conf/distro/include/" # Add class to handle arm-autonomy distro extensions USER_CLASSES_append = " arm-autonomy-features" +BBFILES_DYNAMIC += " \ + meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bbappend \ +" diff --git a/meta-arm-autonomy/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend similarity index 100% rename from meta-arm-autonomy/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_%.bbappend diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend similarity index 100% rename from meta-arm-autonomy/recipes-bsp/images/firmware-image-juno.bbappend rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt similarity index 100% rename from meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r0.txt rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt similarity index 100% rename from meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r1.txt rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt similarity index 100% rename from meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/images-r2.txt rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt diff --git a/meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/uEnv.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt similarity index 100% rename from meta-arm-autonomy/recipes-bsp/images/firmware-image-juno/uEnv.txt rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt