conf/machine: various task-base conversion misc cleanups

diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 97728fa..e600a49 100644 (file)
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -16,14 +16,11 @@ 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"
-
+                        ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
-include conf/machine/include/handheld-common.conf
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
 

diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index a64a58e..c32353f 100644 (file)
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -11,3 +11,5 @@ require conf/machine/include/tune-arm926ejs.conf
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file

diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index b8851f6..af50217 100644 (file)
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -6,10 +6,6 @@ include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-2.6.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-PIVOTBOOT_EXTRA_RRECOMMENDS += ""
-
-# Useful things for the built-in Harddisk
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
 IPKG_EXTRA_ARCHS += "iwmmxt"
 IMAGE_FSTYPES ?= "tar.gz"