From 692ece420e958fe5fdc4e4f01cacfe46ac271abd Mon Sep 17 00:00:00 2001
From: Martin Dietze <di@fh-wedel.de>
Date: Thu, 2 Nov 2006 13:54:27 +0000
Subject: 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

---
 classes/rootfs_ipk.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 8cea393b43..eeb3f75e11 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -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"
-- 
cgit v1.2.3


From 163652f7fb3d27a7efabe76c35f5b903b74bc8a7 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sat, 11 Nov 2006 01:44:32 +0000
Subject: Add quotes for assignments to make the new parser happy

---
 classes/rootfs_ipk.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes/rootfs_ipk.bbclass')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index eeb3f75e11..c4b2991874 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -11,9 +11,9 @@ RDEPENDS += "ipkg ipkg-collateral"
 
 PACKAGES = ""
 
-do_rootfs[nostamp] = 1
-do_rootfs[dirs] = ${TOPDIR}
-do_build[nostamp] = 1
+do_rootfs[nostamp] = "1"
+do_rootfs[dirs] = "${TOPDIR}"
+do_build[nostamp] = "1"
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
 
-- 
cgit v1.2.3