From 325da77bd0fb15ab201b67e5f7789cf7c2c6f805 Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Thu, 12 Jan 2023 12:06:20 +0000 Subject: [PATCH 1/2] [bsp,distro,test] Update layer compatibility The Yocto project has updated it's required compatability to the next release's name to handle some changes in OE-Core, this breaks our builds unless we update our layer compatability information to match. (From Poky rev: db47e8aa9e60adfec3f4201e66039bc513ab7cb2) Changelog: bug Signed-off-by: Drew Reed --- meta-cassini-bsp/conf/layer.conf | 4 ++-- meta-cassini-distro/conf/layer.conf | 4 ++-- meta-cassini-tests/conf/layer.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-cassini-bsp/conf/layer.conf b/meta-cassini-bsp/conf/layer.conf index abe2aba..2ba816e 100644 --- a/meta-cassini-bsp/conf/layer.conf +++ b/meta-cassini-bsp/conf/layer.conf @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved. # # SPDX-License-Identifier: MIT @@ -13,4 +13,4 @@ BBFILES_DYNAMIC += " \ BBFILE_COLLECTIONS += "meta-cassini-bsp" BBFILE_PATTERN_meta-cassini-bsp = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_meta-cassini-bsp = "langdale" +LAYERSERIES_COMPAT_meta-cassini-bsp = "mickledore" diff --git a/meta-cassini-distro/conf/layer.conf b/meta-cassini-distro/conf/layer.conf index c919483..f25f53c 100644 --- a/meta-cassini-distro/conf/layer.conf +++ b/meta-cassini-distro/conf/layer.conf @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved. # # SPDX-License-Identifier: MIT @@ -22,6 +22,6 @@ LAYERDEPENDS_meta-cassini-distro = " \ 'parsec-layer', '', d)} \ " -LAYERSERIES_COMPAT_meta-cassini-distro = "langdale" +LAYERSERIES_COMPAT_meta-cassini-distro = "mickledore" CASSINI_DISTRO_LAYERDIR := "${LAYERDIR}" diff --git a/meta-cassini-tests/conf/layer.conf b/meta-cassini-tests/conf/layer.conf index d25186b..dcd9077 100644 --- a/meta-cassini-tests/conf/layer.conf +++ b/meta-cassini-tests/conf/layer.conf @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved. # # SPDX-License-Identifier: MIT @@ -16,4 +16,4 @@ LAYERDEPENDS_meta-cassini-tests = " \ core \ openembedded-layer" -LAYERSERIES_COMPAT_meta-cassini-tests = "langdale" +LAYERSERIES_COMPAT_meta-cassini-tests = "mickledore" -- GitLab From 2b683e6f892818695df2350fd5c268a1e68189b5 Mon Sep 17 00:00:00 2001 From: Drew Reed Date: Thu, 12 Jan 2023 12:07:08 +0000 Subject: [PATCH 2/2] config: Switch to master-next branch of meta-security The master-next branch has been made compatible with the mickledore yocto release be this hasn't yet been merged to the master branch so we need to switch to master-next temporarily. Signed-off-by: Drew Reed --- meta-cassini-config/kas/include/cassini-base.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-cassini-config/kas/include/cassini-base.yml b/meta-cassini-config/kas/include/cassini-base.yml index 77e8ab1..f15ac47 100644 --- a/meta-cassini-config/kas/include/cassini-base.yml +++ b/meta-cassini-config/kas/include/cassini-base.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved. # # SPDX-License-Identifier: MIT @@ -36,6 +36,7 @@ repos: meta-security: url: https://git.yoctoproject.org/git/meta-security path: layers/meta-security + refspec: master-next layers: meta-parsec: -- GitLab