From 146e9a5178ce6d1a6ae09a2649dc19364d4cca89 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Jan 2023 11:02:48 +0000 Subject: [PATCH] meta-*: mark layers as compatible with mickledore only oe-core's master branch is diverging from langdale and meta-arm will be following this, so drop compatibility with langdale in master so we're free to diverge too. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/layer.conf | 2 +- meta-arm-toolchain/conf/layer.conf | 2 +- meta-arm/conf/layer.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf index 75efe546..e192a83d 100644 --- a/meta-arm-bsp/conf/layer.conf +++ b/meta-arm-bsp/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-arm-bsp" BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-arm-bsp = "5" -LAYERSERIES_COMPAT_meta-arm-bsp = "langdale mickledore" +LAYERSERIES_COMPAT_meta-arm-bsp = "mickledore" LAYERDEPENDS_meta-arm-bsp = "core meta-arm" # This won't be used by layerindex-fetch, but works everywhere else diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf index bb37cd06..a6f403ec 100644 --- a/meta-arm-toolchain/conf/layer.conf +++ b/meta-arm-toolchain/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_PATTERN_arm-toolchain := "^${LAYERDIR}/" BBFILE_PRIORITY_arm-toolchain = "5" LAYERDEPENDS_arm-toolchain = "core" -LAYERSERIES_COMPAT_arm-toolchain = "langdale mickledore" +LAYERSERIES_COMPAT_arm-toolchain = "mickledore" diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index 68d8c562..be8201c7 100644 --- a/meta-arm/conf/layer.conf +++ b/meta-arm/conf/layer.conf @@ -13,7 +13,7 @@ LAYERDEPENDS_meta-arm = " \ core \ arm-toolchain \ " -LAYERSERIES_COMPAT_meta-arm = "langdale mickledore" +LAYERSERIES_COMPAT_meta-arm = "mickledore" # runfvp --console needs telnet, so pull this in for testimage. HOSTTOOLS_NONFATAL += "telnet"