From 32cec3214f7b85457ace98debbbdb687dfac1462 Mon Sep 17 00:00:00 2001 From: Fabien Proriol Date: Tue, 16 Oct 2012 14:32:30 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes') 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..." -- cgit v1.2.3-54-g00ecf