| Message ID | 20230112110257.2070363-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] meta-*: mark layers as compatible with mickledore only | expand |
On Thu, Jan 12, 2023 at 11:02:48AM +0000, Ross Burton wrote: > oe-core's master branch is diverging fron landgale and meta-arm will be typo - landgale? > following this, so drop compatibity with langdale in master so we're > free to diverge too. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > 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" > -- > 2.34.1
On Thu, Jan 12, 2023 at 08:31:34AM -0500, Denys Dmytriyenko wrote: > On Thu, Jan 12, 2023 at 11:02:48AM +0000, Ross Burton wrote: > > oe-core's master branch is diverging fron landgale and meta-arm will be > > typo - landgale? A couple others in there too. I'll fix them before merging Thanks, Jon > > > > following this, so drop compatibity with langdale in master so we're > > free to diverge too. > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > 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" > > -- > > 2.34.1 >
On Thu, 12 Jan 2023 11:02:48 +0000, Ross Burton wrote: > oe-core's master branch is diverging fron landgale and meta-arm will be > following this, so drop compatibity with langdale in master so we're > free to diverge too. Applied, thanks! [01/10] meta-*: mark layers as compatible with mickledore only commit: 146e9a5178ce6d1a6ae09a2649dc19364d4cca89 [02/10] arm: Add addpylib declaration commit: bba5bc91383fe8c72d88ccf6c1992d8106d7b4cf [03/10] arm-toolchain: remove obsolete oe_import commit: d9db8b707541fe15baa3af7b94bff8777876776a [04/10] CI: switch back to master commit: fdf95798bcc39174b4fafd995c1cd62ee21d6994 [05/10] CI: remove obsolete linux-yocto workarounds commit: 725281582aaf65f33c71274f7c86b75e646acacf [06/10] Revert "CI: revert a meta-clang change which breaks pixman (thus, xserver)" commit: d3a0c441cde4a4dd3e3fd6d328c1244f7af076bf [07/10] arm-bsp/fvp-base*: no need to remove rng-tools from openssh commit: 314b3b2eb73d3b91edef225a2cb5b15b9dc55162 [08/10] arm-bsp/fvp-baser-aemv8r64: Rebase u-boot patches onto v2022.10 commit: a7d911310e0d4da4b2f6ca608bd9f528037da6dc [09/10] arm-bsp/u-boot: corstone500: bump to 2022.10 commit: 3f35573acbdc0a3aac9e81d794e14f849d40ee9e [10/10] arm-bsp/u-boot: Corstone1000: bump to v2022.10 commit: a51d4704ccd1737b8bc556bfe3e536142269bedc Best regards,
On Thu, 12 Jan 2023 11:02:48 +0000, Ross Burton wrote: > oe-core's master branch is diverging fron landgale and meta-arm will be > following this, so drop compatibity with langdale in master so we're > free to diverge too. Applied, thanks! [01/10] meta-*: mark layers as compatible with mickledore only commit: 146e9a5178ce6d1a6ae09a2649dc19364d4cca89 [02/10] arm: Add addpylib declaration commit: bba5bc91383fe8c72d88ccf6c1992d8106d7b4cf [03/10] arm-toolchain: remove obsolete oe_import commit: d9db8b707541fe15baa3af7b94bff8777876776a [04/10] CI: switch back to master commit: fdf95798bcc39174b4fafd995c1cd62ee21d6994 [05/10] CI: remove obsolete linux-yocto workarounds commit: 725281582aaf65f33c71274f7c86b75e646acacf [06/10] Revert "CI: revert a meta-clang change which breaks pixman (thus, xserver)" commit: d3a0c441cde4a4dd3e3fd6d328c1244f7af076bf [07/10] arm-bsp/fvp-base*: no need to remove rng-tools from openssh commit: 314b3b2eb73d3b91edef225a2cb5b15b9dc55162 [08/10] arm-bsp/fvp-baser-aemv8r64: Rebase u-boot patches onto v2022.10 commit: a7d911310e0d4da4b2f6ca608bd9f528037da6dc [09/10] arm-bsp/u-boot: corstone500: bump to 2022.10 commit: 3f35573acbdc0a3aac9e81d794e14f849d40ee9e [10/10] arm-bsp/u-boot: Corstone1000: bump to v2022.10 commit: a51d4704ccd1737b8bc556bfe3e536142269bedc Best regards,
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"
oe-core's master branch is diverging fron landgale and meta-arm will be following this, so drop compatibity with langdale in master so we're free to diverge too. Signed-off-by: Ross Burton <ross.burton@arm.com> --- 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(-)