From 6fba58fce627adbef1e13032b6f5ca3dd8059837 Mon Sep 17 00:00:00 2001 From: Daniel Ammann Date: Mon, 15 Apr 2024 08:10:28 +0200 Subject: [PATCH] dynamic-layers: Make use of meta-arm conditional Some SoCs do not use optee and therefore do not need meta-arm. Use dynamic-layers to make it possible to use meta-atmel without meta-arm. Signed-off-by: Daniel Ammann --- conf/layer.conf | 5 +++++ .../meta-arm/recipes-security}/optee/optee-client_%.bbappend | 0 .../recipes-security}/optee/optee-examples_%.bbappend | 0 .../recipes-security}/optee/optee-os-tadevkit_%.bbappend | 0 .../meta-arm/recipes-security}/optee/optee-os_%.bbappend | 0 .../meta-arm/recipes-security}/optee/optee-test_%.bbappend | 0 6 files changed, 5 insertions(+) rename {recipes-security => dynamic-layers/meta-arm/recipes-security}/optee/optee-client_%.bbappend (100%) rename {recipes-security => dynamic-layers/meta-arm/recipes-security}/optee/optee-examples_%.bbappend (100%) rename {recipes-security => dynamic-layers/meta-arm/recipes-security}/optee/optee-os-tadevkit_%.bbappend (100%) rename {recipes-security => dynamic-layers/meta-arm/recipes-security}/optee/optee-os_%.bbappend (100%) rename {recipes-security => dynamic-layers/meta-arm/recipes-security}/optee/optee-test_%.bbappend (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 738ba9db..2d73f147 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -28,3 +28,8 @@ TARGET_POINTER_WIDTH[arm-eabi] = "32" TARGET_C_INT_WIDTH[arm-eabi] = "32" MAX_ATOMIC_WIDTH[arm-eabi] = "64" FEATURES[arm-eabi] = "+v6,+vfp2" + +BBFILES_DYNAMIC += " \ + meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bb \ + meta-arm:${LAYERDIR}/dynamic-layers/meta-arm/*/*/*.bbappend \ +" diff --git a/recipes-security/optee/optee-client_%.bbappend b/dynamic-layers/meta-arm/recipes-security/optee/optee-client_%.bbappend similarity index 100% rename from recipes-security/optee/optee-client_%.bbappend rename to dynamic-layers/meta-arm/recipes-security/optee/optee-client_%.bbappend diff --git a/recipes-security/optee/optee-examples_%.bbappend b/dynamic-layers/meta-arm/recipes-security/optee/optee-examples_%.bbappend similarity index 100% rename from recipes-security/optee/optee-examples_%.bbappend rename to dynamic-layers/meta-arm/recipes-security/optee/optee-examples_%.bbappend diff --git a/recipes-security/optee/optee-os-tadevkit_%.bbappend b/dynamic-layers/meta-arm/recipes-security/optee/optee-os-tadevkit_%.bbappend similarity index 100% rename from recipes-security/optee/optee-os-tadevkit_%.bbappend rename to dynamic-layers/meta-arm/recipes-security/optee/optee-os-tadevkit_%.bbappend diff --git a/recipes-security/optee/optee-os_%.bbappend b/dynamic-layers/meta-arm/recipes-security/optee/optee-os_%.bbappend similarity index 100% rename from recipes-security/optee/optee-os_%.bbappend rename to dynamic-layers/meta-arm/recipes-security/optee/optee-os_%.bbappend diff --git a/recipes-security/optee/optee-test_%.bbappend b/dynamic-layers/meta-arm/recipes-security/optee/optee-test_%.bbappend similarity index 100% rename from recipes-security/optee/optee-test_%.bbappend rename to dynamic-layers/meta-arm/recipes-security/optee/optee-test_%.bbappend