summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorFabien Proriol <Fabien.Proriol@jdsu.com>2012-10-16 14:32:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:33:42 +0100
commit7aee4e9438755c230e1399bd5226d6c8e7fcca31 (patch)
tree313aa9b5dfc5353fe0c46e32b3247ece8b84b669 /meta/classes
parent930216cb9092904642c0419d3475fc731ab0694b (diff)
downloadopenembedded-core-7aee4e9438755c230e1399bd5226d6c8e7fcca31.tar.gz
populate_sdk_base: allow SDK path of various level
In the previous version, tar extraction use the --strip-component option with "4" hard coded value. If we set another SDKPATH, with a different depth, the sdk installation fails. This patch computes the level from the SDKPATH value. Signed-off-by: Fabien Proriol <fabien.proriol@jdsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_base.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 2fe7f15370..a3ac757b23 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -119,6 +119,7 @@ fakeroot create_shar() {
#!/bin/bash
DEFAULT_INSTALL_DIR="${SDKPATH}"
+COMPONENTS_LEN=$(echo ".${SDKPATH}" | sed "s/\// /g" | wc -w)
printf "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): "
read target_sdk_dir
@@ -155,7 +156,7 @@ fi
payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
printf "Extracting SDK..."
-tail -n +$payload_offset $0| tar xj --strip-components=4 -C $target_sdk_dir
+tail -n +$payload_offset $0| tar xj --strip-components=$COMPONENTS_LEN -C $target_sdk_dir
echo "done"
printf "Setting it up..."