Patchwork [1/1] native/nativesdk: Clear MACHINEOVERRIDES

login
register
mail settings
Submitter Khem Raj
Date Aug. 25, 2014, 7:01 p.m.
Message ID <0e3c53a4d84fa2a3c5e6b53697b953fab59a71bc.1408993148.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/78917/
State Accepted
Commit d09e6d883042e5d094cd08d829327c4bbbfae135
Headers show

Comments

Khem Raj - Aug. 25, 2014, 7:01 p.m.
In cases where we override variables e.g PACKAGE_ARCH
conditionally and use a MACHINEOVERRIDE to qualify the
override like

PACKAGE_ARCH_<MACHINE> = "some target PACKAGE_ARCH"

This would also be effective if this recipe is
BBEXTENDED to native or nativesdk which is undesired
This particular issue will cause wrong sysroot to be
used for nativesdk case since PACKAGE_ARCH would have
been modified and eventually changing value of
STAGING_DIR_TARGET which we use as --sysroot option
to cross and cross-canadian built SDK gcc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/native.bbclass    |    1 +
 meta/classes/nativesdk.bbclass |    1 +
 2 files changed, 2 insertions(+)
Otavio Salvador - Aug. 25, 2014, 7:28 p.m.
On Mon, Aug 25, 2014 at 4:01 PM, Khem Raj <raj.khem@gmail.com> wrote:
> In cases where we override variables e.g PACKAGE_ARCH
> conditionally and use a MACHINEOVERRIDE to qualify the
> override like
>
> PACKAGE_ARCH_<MACHINE> = "some target PACKAGE_ARCH"
>
> This would also be effective if this recipe is
> BBEXTENDED to native or nativesdk which is undesired
> This particular issue will cause wrong sysroot to be
> used for nativesdk case since PACKAGE_ARCH would have
> been modified and eventually changing value of
> STAGING_DIR_TARGET which we use as --sysroot option
> to cross and cross-canadian built SDK gcc
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

Tested-by: Otavio Salvador <otavio@ossystems.com.br>
Otavio Salvador - Aug. 28, 2014, 11:22 p.m.
Hello Saul,

On Mon, Aug 25, 2014 at 4:28 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Aug 25, 2014 at 4:01 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> In cases where we override variables e.g PACKAGE_ARCH
>> conditionally and use a MACHINEOVERRIDE to qualify the
>> override like
>>
>> PACKAGE_ARCH_<MACHINE> = "some target PACKAGE_ARCH"
>>
>> This would also be effective if this recipe is
>> BBEXTENDED to native or nativesdk which is undesired
>> This particular issue will cause wrong sysroot to be
>> used for nativesdk case since PACKAGE_ARCH would have
>> been modified and eventually changing value of
>> STAGING_DIR_TARGET which we use as --sysroot option
>> to cross and cross-canadian built SDK gcc
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> Tested-by: Otavio Salvador <otavio@ossystems.com.br>

Can this to be backported to Daisy?

This solve an issue which took a while to figure out in meta-fsl-arm;
this may also affect others and it is hard to debug.

Patch

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 9dec318..adebb97 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -109,6 +109,7 @@  PKG_CONFIG_SYSROOT_DIR = ""
 # we dont want libc-uclibc or libc-glibc to kick in for native recipes
 LIBCOVERRIDE = ""
 CLASSOVERRIDE = "class-native"
+MACHINEOVERRIDES = ""
 
 PATH_prepend = "${COREBASE}/scripts/native-intercept:"
 
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 37c9f79..5e78116 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -8,6 +8,7 @@  STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
 NATIVESDKLIBC ?= "libc-glibc"
 LIBCOVERRIDE = ":${NATIVESDKLIBC}"
 CLASSOVERRIDE = "class-nativesdk"
+MACHINEOVERRIDES = ""
 
 #
 # Update PACKAGE_ARCH and PACKAGE_ARCHS