[oe-commits] org.oe.dev rootfs_ipk.bbclass and ipkg.inc: shell script syntax fixes

[MartinDietze commit]

rootfs_ipk.bbclass and ipkg.inc: shell script syntax fixes
- both files contained code which would only execute if run by bash
- the fixed versions do the same but are more portable

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: 417360ac033b4479de942b20e0673d048a529f97
ViewMTN: http://monotone.openembedded.org/revision.psp?id=417360ac033b4479de942b20e0673d048a529f97
Files:
1
classes/rootfs_ipk.bbclass
packages/ipkg/ipkg.inc
Diffs:

#
# mt diff -rbfb0a1fb8db8d4e4949fe027cfb6cb8d9a05a75b -r417360ac033b4479de942b20e0673d048a529f97
#
# 
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [24abb81ab2fe3b111a063b25f0c8c640c3ffab5e]
#    to [c2d8b4db2c99b751315cb9aec7ffdfa19ee00be6]
# 
# patch "packages/ipkg/ipkg.inc"
#  from [8e9aef63ce683e13e020cce006051f4ba1ab793c]
#    to [d30b7883173e0c568eca20df33d213945f55d864]
# 
============================================================
--- classes/rootfs_ipk.bbclass	24abb81ab2fe3b111a063b25f0c8c640c3ffab5e
+++ classes/rootfs_ipk.bbclass	c2d8b4db2c99b751315cb9aec7ffdfa19ee00be6
@@ -98,7 +98,7 @@ log_check() {
 			for keyword_die in "Cannot find package" "exit 1" ERR Fail
 			do				
 				
-				if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null
+				if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
 				then
 					echo "log_check: There were error messages in the logfile"
 					echo -e "log_check: Matched keyword: [$keyword_die]\n"
============================================================
--- packages/ipkg/ipkg.inc	8e9aef63ce683e13e020cce006051f4ba1ab793c
+++ packages/ipkg/ipkg.inc	d30b7883173e0c568eca20df33d213945f55d864
@@ -26,7 +26,7 @@ if [ "x$D" != "x" ]; then
 if [ "x$D" != "x" ]; then
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
 	# this happens at S98 where our good 'ole packages script used to run
-	echo -e "#!/bin/sh
+	echo "#!/bin/sh
 ipkg-cl configure
 " > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure