From: Phil Blundell <philb@gnu.org>
Date: Sun, 5 Sep 2004 18:02:58 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17376
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b15d04f908852326ff0f03873a5fe19c5852504;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages

2004/09/05 19:02:39+01:00 (none)!pb
repair damage to simpad image construction caused by last change

BKrev: 413b54d23cX65yq-R6mp_lsn3Z020A
---

diff --git a/classes/simpad_flashimg.oeclass b/classes/simpad_flashimg.oeclass
index 84b2d2e1e4..a3aff2e082 100644
--- a/classes/simpad_flashimg.oeclass
+++ b/classes/simpad_flashimg.oeclass
@@ -2,11 +2,8 @@ EXTRA_IMAGEDEPENDS += 'virtual/kernel genboot-native'
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                    --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
 		   ${EXTRA_IMAGECMD}; \
-		   simpad_do_flashimg"
+		   cd ${DEPLOY_DIR_IMAGE}; \
+		   simpad-make-flashimg complete ${STAGING_KERNEL_DIR}/zImage ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+	           mv zImage.initrd.flashfile ${IMAGE_NAME}.img"
 IMAGE_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*; "
 
-simpad_do_flashimg() {
-	cd ${DEPLOY_DIR_IMAGE}
-	simpad-make-flashimg complete ${STAGING_KERNEL_DIR}/zImage ${T}/${IMAGE_NAME}.rootfs.jffs2
-	mv zImage.initrd.flashfile ${IMAGE_NAME}.img
-}