From 9349f11f6676d641d6d7f52a5bdfcab23afb928b Mon Sep 17 00:00:00 2001
From: Martin Dietze <di@fh-wedel.de>
Date: Thu, 2 Nov 2006 13:50:10 +0000
Subject: nylon update: - formally added mtx-3 architecture - pptp support in
 the linux kernel

---
 classes/nylon-image.bbclass | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass
index 8517c033e9..e24aa33cf4 100644
--- a/classes/nylon-image.bbclass
+++ b/classes/nylon-image.bbclass
@@ -1,5 +1,5 @@
 # we dont need the kernel in the image
-ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
+ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/*Image*"
 
 # create a tar.gz (.imgz) file containing the filesystem and the kernel
 nylon_create_imgz() {
@@ -7,8 +7,15 @@ nylon_create_imgz() {
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz
 	install -d ${DEPLOY_DIR_IMAGE}/tmp
 	
-	cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash
+        # copy the kernel (for mips on flash) into tmp  
+        FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin  
+        test -f ${FLASH_BIN} && \ 
+        cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash 
+ 
+        # copy rootfs.jffs (or so) into tmp 
 	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type}
+
+	# make an imgz out of tmp
 	( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * )
 	rm -r ${DEPLOY_DIR_IMAGE}/tmp
 }
-- 
cgit v1.2.3


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')

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