Patchwork buildtools-tarball: Change the way the SDK is sanitized

login
register
mail settings
Submitter Mark Hatle
Date June 24, 2013, 2:47 p.m.
Message ID <1372085235-30550-1-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/52293/
State Accepted
Commit 778cd8d2110ef2db5ff4ae4f0b55c52a8f1ea334
Headers show

Comments

Mark Hatle - June 24, 2013, 2:47 p.m.
The previous method of shrinking down the scale of the environment-setup
file would not work properly when the target is configured with multilibs.

In addition, the configured machine name and similar settings could leak
into the SDK naming.  This was resolved by clearing the SDK generated
files and generating our own custom files.

Note, the name of the environment-setup now is suffixed with the SDK_SYS.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-core/meta/buildtools-tarball.bb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
Paul Eggleton - June 24, 2013, 3:31 p.m.
On Monday 24 June 2013 09:47:15 Mark Hatle wrote:
> +	script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}

I could be wrong but I think this may be a bashism...

Cheers,
Paul
Paul Eggleton - June 24, 2013, 3:33 p.m.
On Monday 24 June 2013 16:31:13 Paul Eggleton wrote:
> On Monday 24 June 2013 09:47:15 Mark Hatle wrote:
> > +	script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
> 
> I could be wrong but I think this may be a bashism...

Actually, I spoke too soon, it isn't. Ignore me...

Cheers,
Paul

Patch

diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index f8024f9..8b68f71 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -49,8 +49,15 @@  inherit meta
 inherit populate_sdk
 
 create_sdk_files_append () {
-	rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config*
-	
-	cat ${SDK_OUTPUT}/${SDKPATH}/environment-setup* | grep " PATH=\|OECORE_NATIVE_SYSROOT" > ${WORKDIR}/envtmp
-	mv ${WORKDIR}/envtmp ${SDK_OUTPUT}/${SDKPATH}/environment-setup*
+	rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
+	rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
+	rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
+
+	# Generate new (mini) sdk-environment-setup file
+	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
+
+	toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
 }