From: Jason Wessel <jason.wessel@windriver.com>
Date: Sat, 19 Jan 2013 15:18:50 +0000 (-0600)
Subject: populate_sdk_base.bbclass: Work around bugs with gnu tar < 1.24
X-Git-Tag: 2015-4~7952
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0f4112016bac07f0294f2a4d0fde4659c0fed2d2;p=openembedded-core.git

populate_sdk_base.bbclass: Work around bugs with gnu tar < 1.24

The gnu tar versions less than 1.24 pose a problem with the SDK
extraction.  A typical SDK will have hard links.  The SDK is created
with a newer version of tar but extracted with the host version of tar
which may be much older.  The specific defect is that older version of
gnu tar do not properly handle the "--strip-components=" argument when
processing hard links and the paths do not get properly truncated and
hooked up with the corresponding real file payloads.  This leads to
errors like the following during the SDK install:

tar: sysroots/qemux86-yocto-linux/usr/bin/getconf: Cannot hard link to `./opt/yocto/SDK-qemux86/sysroots/qemux86-yocto-linux/usr/bin/POSIX_V6_ILP32_OFFBIG': No such file or directory

The simple way to work around the problem is to just not save the path
information that is going to get chopped off anyway.  This has the
added benefit that it saves a small amount of space in the tar archive
as well.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index c1756e8c87..da846b40ca 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -113,7 +113,7 @@ fakeroot create_sdk_files() {
 fakeroot tar_sdk() {
 	# Package it up
 	mkdir -p ${SDK_DEPLOY}
-	cd ${SDK_OUTPUT}
+	cd ${SDK_OUTPUT}/${SDKPATH}
 	tar --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
 }
 
@@ -130,7 +130,6 @@ if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
 fi
 
 DEFAULT_INSTALL_DIR="${SDKPATH}"
-COMPONENTS_LEN=$(echo ".${SDKPATH}" | sed "s/\// /g" | wc -w)
 SUDO_EXEC=""
 target_sdk_dir=""
 answer=""
@@ -212,7 +211,7 @@ fi
 payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
 
 printf "Extracting SDK..."
-tail -n +$payload_offset $0| $SUDO_EXEC tar xj --strip-components=$COMPONENTS_LEN -C $target_sdk_dir
+tail -n +$payload_offset $0| $SUDO_EXEC tar xj -C $target_sdk_dir
 echo "done"
 
 printf "Setting it up..."