From: Chen Qi Date: Fri, 2 Aug 2013 03:37:08 +0000 (+0800) Subject: buildtools-tarball: do not export OECORE_NATIVE_SYSROOT X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd2c606f6747145c4923a59ad9aa2b1d63d910f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git buildtools-tarball: do not export OECORE_NATIVE_SYSROOT 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. Thus, instead of exporting OECORE_NATIVE_SYSROOT, we use a comment here. [YOCTO #4939] (From OE-Core rev: d4a4c764a844a7e61f866af9361f139684037336) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 9771497ea53..1e46308d3d7 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -59,7 +59,10 @@ 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 - + # In order for the self-extraction script to correctly extract and set up things, + # we need a 'OECORE_NATIVE_SYSROOT=xxx' line in environment setup script. + # However, buildtools-tarball is inherently a tool set instead of a fully functional SDK, + # so instead of exporting the variable, we use a comment here. + echo '#OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} }