[PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-arm-toolchain/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
index fe23fd4..778910b 100644
--- a/meta-arm-toolchain/conf/layer.conf
+++ b/meta-arm-toolchain/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERSERIES_COMPAT_arm-toolchain = "honister"
 BB_DANGLINGAPPENDS_WARNONLY = "true"
 
 # These variables are used for armcompiler license
-BB_HASHBASE_WHITELIST:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
+BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
-- 
2.35.1

[PATCH 2/2] meta-arm-toolchain: Use renamed SKIP_RECIPE var flags

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ci/external-gccarm.yml                                 |  2 +-
 .../conf/distro/include/tcmode-external-arm.inc        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/external-gccarm.yml b/ci/external-gccarm.yml
index e1754f7..2af8b5e 100644
--- a/ci/external-gccarm.yml
+++ b/ci/external-gccarm.yml
@@ -3,6 +3,6 @@ header:
 
 local_conf_header:
   cc: |
-    PNBLACKLIST[gcc-cross-arm] = "Using external toolchain"
+    SKIP_RECIPE[gcc-cross-arm] = "Using external toolchain"
     TCMODE = "external-arm"
     EXTERNAL_TOOLCHAIN = "${TOPDIR}/toolchains/${TARGET_ARCH}"
diff --git a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc
index a3ea26f..d413e3f 100644
--- a/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc
+++ b/meta-arm-toolchain/conf/distro/include/tcmode-external-arm.inc
@@ -19,11 +19,11 @@ GCCMULTILIB:forcevariable = "--disable-multilib"
 IMAGE_LINGUAS:forcevariable = ""
 
 # Blacklist toolchain recipes as a belt-and-suspenders way to use the external toolchain
-PNBLACKLIST[glibc] = "Using external toolchain"
-PNBLACKLIST[libgcc] = "Using external toolchain"
-PNBLACKLIST[gcc-cross] = "Using external toolchain"
-PNBLACKLIST[gcc-runtime] = "Using external toolchain"
-PNBLACKLIST[gcc-sanitizers] = "Using external toolchain"
+SKIP_RECIPE[glibc] = "Using external toolchain"
+SKIP_RECIPE[libgcc] = "Using external toolchain"
+SKIP_RECIPE[gcc-cross] = "Using external toolchain"
+SKIP_RECIPE[gcc-runtime] = "Using external toolchain"
+SKIP_RECIPE[gcc-sanitizers] = "Using external toolchain"
 
 PREFERRED_PROVIDER_linux-libc-headers = "external-arm-toolchain"
 PREFERRED_PROVIDER_linux-libc-headers-dev = "external-arm-toolchain"
-- 
2.35.1

Re: [meta-arm] [PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[Denys Dmytriyenko]

Just to clarify - both of these changes are in oe-core/master-next and have 
not been merged to master yet...


On Wed, Feb 16, 2022 at 10:42:19AM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-arm-toolchain/conf/layer.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
> index fe23fd4..778910b 100644
> --- a/meta-arm-toolchain/conf/layer.conf
> +++ b/meta-arm-toolchain/conf/layer.conf
> @@ -15,4 +15,4 @@ LAYERSERIES_COMPAT_arm-toolchain = "honister"
>  BB_DANGLINGAPPENDS_WARNONLY = "true"
>  
>  # These variables are used for armcompiler license
> -BB_HASHBASE_WHITELIST:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> +BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> -- 
> 2.35.1

Re: [meta-arm] [PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[Khem Raj]

On Wed, Feb 16, 2022 at 10:53 AM Denys Dmytriyenko <denis@denix.org> wrote:
>
> Just to clarify - both of these changes are in oe-core/master-next and have
> not been merged to master yet...
>

if you meant to say that these changes depend on oe-core changes in
master-next then yes
we will have to wait for those to land in master before merging these
in meta-arm.
however I sent it so folks who are doing CI with master-next can use them

>
> On Wed, Feb 16, 2022 at 10:42:19AM -0800, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta-arm-toolchain/conf/layer.conf | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
> > index fe23fd4..778910b 100644
> > --- a/meta-arm-toolchain/conf/layer.conf
> > +++ b/meta-arm-toolchain/conf/layer.conf
> > @@ -15,4 +15,4 @@ LAYERSERIES_COMPAT_arm-toolchain = "honister"
> >  BB_DANGLINGAPPENDS_WARNONLY = "true"
> >
> >  # These variables are used for armcompiler license
> > -BB_HASHBASE_WHITELIST:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > +BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > --
> > 2.35.1

Re: [meta-arm] [PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[Denys Dmytriyenko]

On Wed, Feb 16, 2022 at 11:04:04AM -0800, Khem Raj wrote:
> On Wed, Feb 16, 2022 at 10:53 AM Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > Just to clarify - both of these changes are in oe-core/master-next and have
> > not been merged to master yet...
> >
> 
> if you meant to say that these changes depend on oe-core changes in
> master-next then yes
> we will have to wait for those to land in master before merging these
> in meta-arm.
> however I sent it so folks who are doing CI with master-next can use them

Jon, Ross,

Please merge these 2 patches, along with the layer compatibility patch I just 
sent[1] to restore meta-arm compatibilty with OE-Core master/kirkstone. 
Thanks!

[1] https://lists.yoctoproject.org/g/meta-arm/message/3034


> > On Wed, Feb 16, 2022 at 10:42:19AM -0800, Khem Raj wrote:
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ---
> > >  meta-arm-toolchain/conf/layer.conf | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
> > > index fe23fd4..778910b 100644
> > > --- a/meta-arm-toolchain/conf/layer.conf
> > > +++ b/meta-arm-toolchain/conf/layer.conf
> > > @@ -15,4 +15,4 @@ LAYERSERIES_COMPAT_arm-toolchain = "honister"
> > >  BB_DANGLINGAPPENDS_WARNONLY = "true"
> > >
> > >  # These variables are used for armcompiler license
> > > -BB_HASHBASE_WHITELIST:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > > +BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > > --
> > > 2.35.1

Re: [meta-arm] [PATCH 1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable

[Ross Burton]

There are more patches than those needed, so I'll merge the complete
update once CI has validated that the build is successful.

Rosss

On Tue, 22 Feb 2022 at 02:36, Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Wed, Feb 16, 2022 at 11:04:04AM -0800, Khem Raj wrote:
> > On Wed, Feb 16, 2022 at 10:53 AM Denys Dmytriyenko <denis@denix.org> wrote:
> > >
> > > Just to clarify - both of these changes are in oe-core/master-next and have
> > > not been merged to master yet...
> > >
> >
> > if you meant to say that these changes depend on oe-core changes in
> > master-next then yes
> > we will have to wait for those to land in master before merging these
> > in meta-arm.
> > however I sent it so folks who are doing CI with master-next can use them
>
> Jon, Ross,
>
> Please merge these 2 patches, along with the layer compatibility patch I just
> sent[1] to restore meta-arm compatibilty with OE-Core master/kirkstone.
> Thanks!
>
> [1] https://lists.yoctoproject.org/g/meta-arm/message/3034
>
>
> > > On Wed, Feb 16, 2022 at 10:42:19AM -0800, Khem Raj wrote:
> > > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > ---
> > > >  meta-arm-toolchain/conf/layer.conf | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta-arm-toolchain/conf/layer.conf b/meta-arm-toolchain/conf/layer.conf
> > > > index fe23fd4..778910b 100644
> > > > --- a/meta-arm-toolchain/conf/layer.conf
> > > > +++ b/meta-arm-toolchain/conf/layer.conf
> > > > @@ -15,4 +15,4 @@ LAYERSERIES_COMPAT_arm-toolchain = "honister"
> > > >  BB_DANGLINGAPPENDS_WARNONLY = "true"
> > > >
> > > >  # These variables are used for armcompiler license
> > > > -BB_HASHBASE_WHITELIST:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > > > +BB_BASEHASH_IGNORE_VARS:append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
> > > > --
> > > > 2.35.1
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#3035): https://lists.yoctoproject.org/g/meta-arm/message/3035
> Mute This Topic: https://lists.yoctoproject.org/mt/89192253/1676615
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ross@burtonini.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>