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

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date July 30, 2013, 1:50 a.m.
Message ID <bc3108ce8eea753d38dc70187fface31e6178e71.1375073005.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/54749/
State New
Headers show

Comments

Qi.Chen@windriver.com - July 30, 2013, 1:50 a.m.
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.

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(-)
Saul Wold - Aug. 1, 2013, 6:12 p.m.
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?

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}
>   }
>
Qi.Chen@windriver.com - Aug. 2, 2013, 1:54 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?
>
meta/classes/populate_sdk_base.bbclass

The self-extraction script needs to get the location of native sysroot. 
And it does so by grep 'OECORE_NATIVE_SYSROOT=' expression in 
$env_setup_script.

Please see more details below (code snippet from populate_sdk_base.bbclass).

chenqi@pek-qchen1-d1:~/poky$ grep -i oecore_native_sysroot 
meta/classes/populate_sdk_base.bbclass
native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 
'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"')
chenqi@pek-qchen1-d1:~/poky$ grep -i -w native_sysroot 
meta/classes/populate_sdk_base.bbclass
native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 
'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"')
dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*")
executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111)
$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep 
":.*\(ASCII\|script\|source\).*text"|cut -d':' -f1|$SUDO_EXEC xargs sed 
-i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
for l in $($SUDO_EXEC find $native_sysroot -type l); do
# find out all perl scripts in $native_sysroot and modify them replacing the
for perl_script in $($SUDO_EXEC grep "^#!.*perl" -rl $native_sysroot); do

Best Regards,
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

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}
 }