ddimage: fix incompatibility with dash

PATCH New Hongxu Jia 1 participant 2 messages Jun 6, 2013

lore

Share & tools

lore

Hongxu Jia

author

2013-06-06 06:53 UTC #0 lore raw

cover ddimage: fix incompatibility with dash

The following changes since commit a62aed41f2d8f874f7ae24d0e5be5dbc66ea2199:

lrzsz: check locale.h in configure (2013-06-04 15:55:46 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-ddiamge
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-ddiamge

Hongxu Jia (1):
ddimage: fix incompatibility with dash

 scripts/contrib/ddimage |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Signature · 1 line

1.7.10.4

Hongxu Jia

author

2013-06-06 06:53 UTC #1 lore raw

PATCH 1/1 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]

Signed-off-by Hongxu Jia <[email protected]>

---
 scripts/contrib/ddimage |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

scripts/contrib/ddimage +9 -7

index 956699c..ab1d4c7 100755
@@ -6,11 +6,11 @@ BLACKLIST_DEVICES="/dev/sda"
 # 1MB blocksize
 BLOCKSIZE=1048576
 
-function usage() {
+usage() {
 	echo "Usage: $(basename $0) IMAGE DEVICE"
 }
 
-function image_details() {
+image_details() {
 	IMG=$1
 	echo "Image details"
 	echo "============="

@@ -21,7 +21,7 @@ function image_details() {
 	echo ""
 }
 
-function device_details() {
+device_details() {
 	DEV=$1
 	BLOCK_SIZE=512

@@ -61,10 +61,12 @@ if [ ! -e "$IMAGE" ]; then
 fi
 
 
-if [ "${BLACKLIST_DEVICES/${DEVICE}/ERROR}" != "$BLACKLIST_DEVICES" ]; then
-	echo "ERROR: Device $DEVICE is blacklisted"
-	exit 1
-fi
+for i in ${BLACKLIST_DEVICES}; do
+	if [ "$i" = "$DEVICE" ]; then
+		echo "ERROR: Device $DEVICE is blacklisted"
+		exit 1
+	fi
+done
 
 if [ ! -w "$DEVICE" ]; then
 	echo "ERROR: Device $DEVICE does not exist or is not writable"

Signature · 1 line

1.7.10.4