summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/simpad_flashimg.oeclass7
-rw-r--r--conf/zaurus-pxa.conf4
2 files changed, 7 insertions, 4 deletions
diff --git a/classes/simpad_flashimg.oeclass b/classes/simpad_flashimg.oeclass
index ce591f7366..84b2d2e1e4 100644
--- a/classes/simpad_flashimg.oeclass
+++ b/classes/simpad_flashimg.oeclass
@@ -1,9 +1,12 @@
EXTRA_IMAGEDEPENDS += 'virtual/kernel genboot-native'
-IMAGE_CMD_jffs2 += '; simpad_do_flashimg'
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
+ ${EXTRA_IMAGECMD}; \
+ simpad_do_flashimg"
IMAGE_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*; "
simpad_do_flashimg() {
cd ${DEPLOY_DIR_IMAGE}
- simpad-make-flashimg complete ${STAGING_KERNEL_DIR}/zImage ${IMAGE_NAME}.rootfs.jffs2
+ simpad-make-flashimg complete ${STAGING_KERNEL_DIR}/zImage ${T}/${IMAGE_NAME}.rootfs.jffs2
mv zImage.initrd.flashfile ${IMAGE_NAME}.img
}
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 41e9e76e27..9c7f79b5f1 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -11,10 +11,10 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
- --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
${EXTRA_IMAGECMD}; \
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 > \
+ ${T}/${IMAGE_NAME}.rootfs.jffs2 > \
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
GPE_MACHINE_CLASS = "bigscreen"