Patchwork [1/1] buildtools-tarball: unset OECORE_NATIVE_SYSROOT

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Aug. 2, 2013, 2:08 a.m.
Message ID <51FB14A3.9040706@windriver.com>
Download mbox | patch
Permalink /patch/54941/
State New
Headers show

Comments

Qi.Chen@windriver.com - Aug. 2, 2013, 2:08 a.m.
On 08/02/2013 02:12 AM, Saul Wold wrote:
> On 07/29/2013 06:50 PM, Qi.Chen@windriver.com wrote:
>> From: Chen Qi <Qi.Chen@windriver.com>
>>
>> When building a qemu image inside the environment created by the
>> buildtools-tarball, the qemu image cannot be started, as the runqemu
>> script uses the tunctl binary which cannot be found inside the sysroot
>> directory of the buildtools-tarball.
>>
>> The buildtools-tarball is inherently a tool set instead of a fully
>> functional SDK, so leaving the OECORE_NATIVE_SYSROOT variable in the
>> environment will mess things up.
>>
>> However, we do need a line of 'OECORE_NATIVE_SYSROOT=xxx' in the 
>> environment
>> setup script so that the SDK can be extracted and relocated correctly.
>>
> Where is this being processed, can could be done as a since comment in 
> the the environment-setup script instead of exporting and unseting it?
>
Ah.... I got what you mean.
It's something like:

${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
  }

I'll test this and send out a V2 if it works.

Thanks,
Chen Qi

> Sau!
>> That's why this patch unsets the variable instead of removing it from 
>> the
>> environment setup script.
>>
>> [YOCTO #4939]
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   meta/recipes-core/meta/buildtools-tarball.bb |    6 +++++-
>>   1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-core/meta/buildtools-tarball.bb 
>> b/meta/recipes-core/meta/buildtools-tarball.bb
>> index 9771497..1f8f142 100644
>> --- a/meta/recipes-core/meta/buildtools-tarball.bb
>> +++ b/meta/recipes-core/meta/buildtools-tarball.bb
>> @@ -59,7 +59,11 @@ create_sdk_files_append () {
>> script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
>>       touch $script
>>       echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> 
>> $script
>> +    # OECORE_NATIVE_SYSROOT variable needs to be in $script so that the
>> +    # relocate script can find the ld-linux.so.
>>       echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
>> -
>> +    # buildtools-tarball is inherently a tool set instead of a fully 
>> functional SDK.
>> +    # Leaving OECORE_NATIVE_SYSROOT in environment will mess things up.
>> +    echo 'unset OECORE_NATIVE_SYSROOT' >> $script
>>       toolchain_create_sdk_version 
>> ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
>>   }
>>
>
>

Patch

--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -59,7 +59,7 @@  create_sdk_files_append () {
script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
         touch $script
         echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> 
$script
-       echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
+       echo '#OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script

         toolchain_create_sdk_version