summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-09-05 18:02:58 +0000
committerPhil Blundell <philb@gnu.org>2004-09-05 18:02:58 +0000
commit6b15d04f908852326ff0f03873a5fe19c5852504 (patch)
tree9f99cafd29b016969188426ac7c81c750775afa5
parent61e04971071f24c980a6d1d202f6dda8a2b671ca (diff)
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
-rw-r--r--classes/simpad_flashimg.oeclass9
1 files changed, 3 insertions, 6 deletions
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
-}