[oe-commits] org.oe.dev zaurus-2.6: Create an install kit when generating images (from bug #2690 with modifications)

[rpurdie commit]

zaurus-2.6: Create an install kit when generating images (from bug #2690 with modifications)

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

#
# mt diff -r5a83d568fe038217c926b4156a9450c3039bfb70 -rbd74f0d95f3b638b0b4131cb4eb597be6b3b4198
#
# 
# 
# patch "classes/image.bbclass"
#  from [ce0f0d35208d7dd219730207d787be86751416c5]
#    to [6bfd73489be48ca3395112458e8092971909dc82]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [08f890e9c168eb62bf5bb23912bd916c209271ed]
#    to [72f56a86eaabe41773f1417f2934a7ed5a2b288b]
# 
============================================================
--- classes/image.bbclass	ce0f0d35208d7dd219730207d787be86751416c5
+++ classes/image.bbclass	6bfd73489be48ca3395112458e8092971909dc82
@@ -58,6 +58,7 @@ ROOTFS_POSTPROCESS_COMMAND ?= ""
 LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
 
 ROOTFS_POSTPROCESS_COMMAND ?= ""
+MACHINE_POSTPROCESS_COMMAND ?= ""
 
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
@@ -100,6 +101,8 @@ fakeroot do_rootfs () {
 	done
 
 	${IMAGE_POSTPROCESS_COMMAND}
+	
+	${MACHINE_POSTPROCESS_COMMAND}
 }
 
 insert_feed_uris () {
============================================================
--- conf/machine/include/zaurus-2.6.inc	08f890e9c168eb62bf5bb23912bd916c209271ed
+++ conf/machine/include/zaurus-2.6.inc	72f56a86eaabe41773f1417f2934a7ed5a2b288b
@@ -40,3 +40,30 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
+    mkdir ${IMAGE_NAME}-installkit/
+
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+ 
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
+}