summaryrefslogtreecommitdiffstats
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:44:59 +0100
commit32cec3214f7b85457ace98debbbdb687dfac1462 (patch)
treef04a594d8854dbcbbba98208ec8078f742251067
parent39e8e068c572b62e9a949c6402492092275e5bbe (diff)
downloadpoky-32cec3214f7b85457ace98debbbdb687dfac1462.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. (From OE-Core rev: 7aee4e9438755c230e1399bd5226d6c8e7fcca31) Signed-off-by: Fabien Proriol <fabien.proriol@jdsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
119#!/bin/bash 119#!/bin/bash
120 120
121DEFAULT_INSTALL_DIR="${SDKPATH}" 121DEFAULT_INSTALL_DIR="${SDKPATH}"
122COMPONENTS_LEN=$(echo ".${SDKPATH}" | sed "s/\// /g" | wc -w)
122 123
123printf "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " 124printf "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): "
124read target_sdk_dir 125read target_sdk_dir
@@ -155,7 +156,7 @@ fi
155payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1)) 156payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
156 157
157printf "Extracting SDK..." 158printf "Extracting SDK..."
158tail -n +$payload_offset $0| tar xj --strip-components=4 -C $target_sdk_dir 159tail -n +$payload_offset $0| tar xj --strip-components=$COMPONENTS_LEN -C $target_sdk_dir
159echo "done" 160echo "done"
160 161
161printf "Setting it up..." 162printf "Setting it up..."