| Message ID | 20220216184220.3494070-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] meta-arm-toolchain: Use renamed BB_BASEHASH_IGNORE_VARS variable | expand |
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
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
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
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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"
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta-arm-toolchain/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)