summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2015-09-07 13:42:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:40 +0100
commit08d07355c5b807693a059bf7dc4dc614350bd53f (patch)
tree8348671c80e796fc1f140578e478c5da55efa25c
parentf5f9185344df1408e4bccfecd352373522721910 (diff)
downloadpoky-08d07355c5b807693a059bf7dc4dc614350bd53f.tar.gz
toolchain-shar-extract.sh: better default install path for extensible SDK
Extensible SDK cannot be installed as root so by default offer to install it in user's home directory under distro/distro_version replacing the normal SDK version '+' char with a '_' as that's a restricted character for bitbake (From OE-Core rev: 5486e76cd8abb946b81cff78719d67cfb87cddc6) Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/files/toolchain-shar-extract.sh16
2 files changed, 14 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index a9e9bd71d2..b015bf062c 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -55,6 +55,7 @@ SDK_PRE_INSTALL_COMMAND ?= ""
55SDK_POST_INSTALL_COMMAND ?= "" 55SDK_POST_INSTALL_COMMAND ?= ""
56SDK_RELOCATE_AFTER_INSTALL ?= "1" 56SDK_RELOCATE_AFTER_INSTALL ?= "1"
57 57
58SDKEXTPATH ?= "~/${@d.getVar('DISTRO', True)}_sdk"
58SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK" 59SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK"
59 60
60SDK_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest" 61SDK_TARGET_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"
@@ -154,6 +155,7 @@ EOF
154 # substitute variables 155 # substitute variables
155 sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \ 156 sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
156 -e 's#@SDKPATH@#${SDKPATH}#g' \ 157 -e 's#@SDKPATH@#${SDKPATH}#g' \
158 -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \
157 -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ 159 -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
158 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ 160 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
159 -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ 161 -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 85719fa4ab..27a16074b7 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -36,7 +36,6 @@ while getopts ":yd:DRS" OPT; do
36 case $OPT in 36 case $OPT in
37 y) 37 y)
38 answer="Y" 38 answer="Y"
39 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
40 ;; 39 ;;
41 d) 40 d)
42 target_sdk_dir=$OPTARG 41 target_sdk_dir=$OPTARG
@@ -73,9 +72,18 @@ fi
73 72
74@SDK_PRE_INSTALL_COMMAND@ 73@SDK_PRE_INSTALL_COMMAND@
75 74
75# SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above
76if [ "$SDK_EXTENSIBLE" = "1" ]; then
77 DEFAULT_INSTALL_DIR="@SDKEXTPATH@"
78fi
79
76if [ "$target_sdk_dir" = "" ]; then 80if [ "$target_sdk_dir" = "" ]; then
77 read -e -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir 81 if [ "$answer" = "Y" ]; then
78 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR 82 target_sdk_dir="$DEFAULT_INSTALL_DIR"
83 else
84 read -e -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir
85 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
86 fi
79fi 87fi
80 88
81eval target_sdk_dir=$(echo "$target_sdk_dir"|sed 's/ /\\ /g') 89eval target_sdk_dir=$(echo "$target_sdk_dir"|sed 's/ /\\ /g')
@@ -155,7 +163,7 @@ echo "done"
155printf "Setting it up..." 163printf "Setting it up..."
156# fix environment paths 164# fix environment paths
157for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do 165for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
158 $SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script 166 $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script
159done 167done
160 168
161@SDK_POST_INSTALL_COMMAND@ 169@SDK_POST_INSTALL_COMMAND@