buildtools-tarball: do not export OECORE_NATIVE_SYSROOT

From: Chen Qi <[email protected]>

The following changes since commit 67864ca79da08df752487a3a4e1a975546da123d:

systemd: Remove systemd_unitdir if systemd is not in distro features (2013-07-24 11:35:39 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/buildtools-env
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/buildtools-env

Chen Qi (1):
buildtools-tarball: do not export OECORE_NATIVE_SYSROOT

 meta/recipes-core/meta/buildtools-tarball.bb |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

1.7.9.5

From: Chen Qi <[email protected]>

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]

---
 meta/recipes-core/meta/buildtools-tarball.bb |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

index 9771497..1e46308 100644
@@ -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}
 }

1.7.9.5