diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-11 20:58:28 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-11 20:58:28 +0000 |
| commit | fb1a7239ec37f5565371d6ddbd9aa21a6290bdd9 (patch) | |
| tree | 1ab2440660a2ccee4c248310daf8e8d5ab74a86f | |
| parent | ef8ac22cb3ff5c7e0e1fa963a542db62bcf919ce (diff) | |
| parent | 9eecd549fc01c25b3ea788fd1fa5edb339dc3f75 (diff) | |
merge of '320cd49f6ce7994ee9c34b9b23d6c3feaf3889fc'
and '43dea0134aceb7d9e9b13bdaf025552aeef1fa64'
| -rw-r--r-- | conf/machine/include/collie-2.6.inc | 27 | ||||
| -rw-r--r-- | packages/images/minimal-gpe-image.bb | 22 |
2 files changed, 49 insertions, 0 deletions
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc index f22ffce6c2..36b01c7ef2 100644 --- a/conf/machine/include/collie-2.6.inc +++ b/conf/machine/include/collie-2.6.inc @@ -4,3 +4,30 @@ SERIAL_CONSOLE = "115200 ttySA0" MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi" MACHINE_EXTRA_RDEPENDS = "kernel-modules" + +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 + [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && 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/ +} + + diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb new file mode 100644 index 0000000000..356070f5f8 --- /dev/null +++ b/packages/images/minimal-gpe-image.bb @@ -0,0 +1,22 @@ +#Angstrom minimal gpe image +# This image provides a barebone dm and 'desktop' +# Very angstrom and ipkg centric + +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "minimalist-gpe-image" + +DEPENDS = "task-boot" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-boot \ + gpe-session-scripts gpe-login \ + matchbox-wm \ + angstrom-feed-configs \ + ipkg \ + " + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image |