1 files changed, 9 insertions, 10 deletions
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf
index b447456b77..fb27197174 100644
--- a/meta/conf/machine/include/zaurus-clamshell.conf
+++ b/meta/conf/machine/include/zaurus-clamshell.conf
@@ -3,20 +3,19 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=0x4000 -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=0x4000 -l -p; \
                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-# add a summary to the jffs2 file to make it mount a lot faster
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
-                         -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary"
-                         --eraseblock=0x4000 -l -p"
-IMAGE_CMD_jffs2 +=      "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                         ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2"
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"

diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf index b447456b77..fb27197174 100644 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ b/meta/conf/machine/include/zaurus-clamshell.conf
@@ -3,20 +3,19 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
3		3
4	PREFERRED_PROVIDER_xserver = "xserver-kdrive"	4	PREFERRED_PROVIDER_xserver = "xserver-kdrive"
5		5
6	EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
7	EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"	6	EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
8		7
9	IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \	8	IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
10	--output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \	9	--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=0x4000 -n \
		10	&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
		11	-o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
		12	--eraseblock=0x4000 -l -p; \
11	cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \	13	cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
12	${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"	14	${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
13		15	rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
14	# add a summary to the jffs2 file to make it mount a lot faster	16	cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
15	EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \	17	${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
16	-o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \	18	rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary"
17	--eraseblock=0x4000 -l -p"
18	IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
19	${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2"
20		19
21	GUI_MACHINE_CLASS = "bigscreen"	20	GUI_MACHINE_CLASS = "bigscreen"
22	GPE_EXTRA_INSTALL += "gaim sylpheed"	21	GPE_EXTRA_INSTALL += "gaim sylpheed"