Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/08/02 10:15:53+01:00 (none)!pb
avoid shipping zImage in simpad rootfs

BKrev: 410e065bK1FENd7sEDB_M6YMooieNA

diff --git a/classes/simpad_flashimg.oeclass b/classes/simpad_flashimg.oeclass
index e69de29..ce591f7 100644 (file)
--- a/classes/simpad_flashimg.oeclass
+++ b/classes/simpad_flashimg.oeclass
@@ -0,0 +1,9 @@
+EXTRA_IMAGEDEPENDS += 'virtual/kernel genboot-native'
+IMAGE_CMD_jffs2 += '; 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
+       mv zImage.initrd.flashfile ${IMAGE_NAME}.img
+}

diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 267e1e8..00eeb0f 100644 (file)
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -5,8 +5,8 @@ GPE_MACHINE_CLASS ?= "none"
 GPE_EXTRA_DEPENDS ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
 GPE_EXTRA_INSTALL ?= "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}"
 
-GPE_EXTRA_DEPENDS_bigscreen = "minimo gaim linphone rhythmbox"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gaim linphone rhythmbox"
+GPE_EXTRA_DEPENDS_bigscreen = "firefox"
+GPE_EXTRA_INSTALL_bigscreen = "firefox"
 
 GPE_EXTRA_DEPENDS_smallscreen = "minimo"
 GPE_EXTRA_INSTALL_smallscreen = "minimo"
@@ -26,6 +26,6 @@ export IPKG_INSTALL = 'task-bootstrap ${XSERVER} \
                      glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png \
                      ${GPE_EXTRA_INSTALL}'
 
-IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
+IMAGE_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk