summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-06-06 06:53:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 14:38:00 (GMT)
commita3bf47abb4f3c4df65faef28ba52e5fc33301c73 (patch)
tree00f64abc760cbdbd71b0d7181f64f8ec27da39ff /scripts
parent66079795c9eaec1a7ae376b25d91eea14e6498b7 (diff)
downloadpoky-a3bf47abb4f3c4df65faef28ba52e5fc33301c73.tar.gz
ddimage: fix incompatibility with dash
On systems with dash as /bin/sh there were failures while invoking ddimage. Fix to let it work with both bash and dash shells. [YOCTO #4617] (From OE-Core rev: 4c6f7a5d8bd6ada434b91037ecd5db06f3eac814) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/ddimage16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/contrib/ddimage b/scripts/contrib/ddimage
index 956699c..ab1d4c7 100755
--- a/scripts/contrib/ddimage
+++ b/scripts/contrib/ddimage
@@ -6,11 +6,11 @@ BLACKLIST_DEVICES="/dev/sda"
6# 1MB blocksize 6# 1MB blocksize
7BLOCKSIZE=1048576 7BLOCKSIZE=1048576
8 8
9function usage() { 9usage() {
10 echo "Usage: $(basename $0) IMAGE DEVICE" 10 echo "Usage: $(basename $0) IMAGE DEVICE"
11} 11}
12 12
13function image_details() { 13image_details() {
14 IMG=$1 14 IMG=$1
15 echo "Image details" 15 echo "Image details"
16 echo "=============" 16 echo "============="
@@ -21,7 +21,7 @@ function image_details() {
21 echo "" 21 echo ""
22} 22}
23 23
24function device_details() { 24device_details() {
25 DEV=$1 25 DEV=$1
26 BLOCK_SIZE=512 26 BLOCK_SIZE=512
27 27
@@ -61,10 +61,12 @@ if [ ! -e "$IMAGE" ]; then
61fi 61fi
62 62
63 63
64if [ "${BLACKLIST_DEVICES/${DEVICE}/ERROR}" != "$BLACKLIST_DEVICES" ]; then 64for i in ${BLACKLIST_DEVICES}; do
65 echo "ERROR: Device $DEVICE is blacklisted" 65 if [ "$i" = "$DEVICE" ]; then
66 exit 1 66 echo "ERROR: Device $DEVICE is blacklisted"
67fi 67 exit 1
68 fi
69done
68 70
69if [ ! -w "$DEVICE" ]; then 71if [ ! -w "$DEVICE" ]; then
70 echo "ERROR: Device $DEVICE does not exist or is not writable" 72 echo "ERROR: Device $DEVICE does not exist or is not writable"