[oe-commits] org.oe.dev zaurus machines includes: Fix jffs2 image generation to end in .jffs2 to fix magic symlinks, correctly set akita eraseblock size (removes empty flash warnings upon boot), remove temp images from saving some diskspace, generally clean up clamshell file (from poky)

[rpurdie commit]

zaurus machines includes: Fix jffs2 image generation to end in .jffs2 to fix magic symlinks, correctly set akita eraseblock size (removes empty flash warnings upon boot), remove temp images from  saving some diskspace, generally clean up clamshell file (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: f00466f8bdfd620de927136b79861e8d59cd2855
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f00466f8bdfd620de927136b79861e8d59cd2855
Files:
1
conf/machine/include/zaurus-2.6.conf
conf/machine/include/zaurus-clamshell.conf
Diffs:

#
# mt diff -rc4be9fe2be390523d92d54192062b77bbd3a5dc8 -rf00466f8bdfd620de927136b79861e8d59cd2855
#
# 
# 
# patch "conf/machine/include/zaurus-2.6.conf"
#  from [7ffd0b2b750952184c36768750364a5ea0500343]
#    to [01fc9b9fcfb922d37523ae0dff39bfc7a30b945f]
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [701af8ec6aa6800f18a1e570e2d4f0f3e353261c]
#    to [d02e96c1848be0734e19d6e217a753e7a10f0e83]
# 
============================================================
--- conf/machine/include/zaurus-2.6.conf	7ffd0b2b750952184c36768750364a5ea0500343
+++ conf/machine/include/zaurus-2.6.conf	01fc9b9fcfb922d37523ae0dff39bfc7a30b945f
@@ -6,8 +6,11 @@ MACHINE_KERNEL_VERSION = "2.6"
 
 MACHINE_KERNEL_VERSION = "2.6"
 
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
+ERASEBLOCKSIZE = "0x4000"
+ERASEBLOCKSIZE_akita = "0x20000"
 
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
+
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
============================================================
--- conf/machine/include/zaurus-clamshell.conf	701af8ec6aa6800f18a1e570e2d4f0f3e353261c
+++ conf/machine/include/zaurus-clamshell.conf	d02e96c1848be0734e19d6e217a753e7a10f0e83
@@ -1,14 +1,13 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${I
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
+		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
-
-# add a summary to the jffs2 file to make it mount a lot faster
-EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                         -o ${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.img"