summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-09-15 19:04:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-24 17:52:48 +0100
commite951e20c4ef6a3f003f84e8f1bea568d1b7ef541 (patch)
treed5f97221d340afe92c3137e244bf9f2abf710458
parent4b9f70f03cbefe9db758500e3ad89f7a8ff8226e (diff)
downloadopenembedded-core-contrib-e951e20c4ef6a3f003f84e8f1bea568d1b7ef541.tar.gz
openembedded-core-contrib-e951e20c4ef6a3f003f84e8f1bea568d1b7ef541.tar.bz2
openembedded-core-contrib-e951e20c4ef6a3f003f84e8f1bea568d1b7ef541.zip
toolchain-shar-extract.sh: remove checkbashism
Fixed when sh is bash: $ sh ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-1.8+snapshot.sh Poky (Yocto Project Reference Distro) SDK installer version 1.8+snapshot =========================================================== ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-1.8+snapshot.sh: 77: read: Illegal option -e You are about to install the SDK to "/opt/poky/1.8+snapshot". Proceed[Y/n]? ../SDK2 Installation aborted! There is ony one bashism "read -e" in toolchain-shar-extract.sh, but '-e' is useless here, so remove it and use /bin/sh. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/files/toolchain-shar-extract.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 6891279350..dd92d0eb7f 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
@@ -86,7 +86,7 @@ if [ "$target_sdk_dir" = "" ]; then
if [ "$answer" = "Y" ]; then
target_sdk_dir="$DEFAULT_INSTALL_DIR"
else
- read -e -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir
+ read -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir
[ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
fi
fi