[oe-commits] org.oe.dev conf/machine: various task-base conversion misc cleanups

[rpurdie commit]

conf/machine: various task-base conversion misc cleanups

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

#
# mt diff -rf74511a39f091ce9c32fcb1977e354486234a11e -r34625a6c4d61950bfc2d75fbb3454d050528cdd5
#
# 
# 
# patch "conf/machine/include/zaurus-clamshell.conf"
#  from [8a8a599f02be15515dfb973930a599edf8a4e5b0]
#    to [f73532615c93e80eaed263729d26bd685c49d18c]
# 
# patch "conf/machine/qemuarm.conf"
#  from [d3f29105c2eee36c9790874b55a3b41a3cce3654]
#    to [f52b81d6683cbbc2e15c093b3f14e2fcddede5e7]
# 
# patch "conf/machine/spitz.conf"
#  from [c0bb39b828feec5dc86c26f3a16f626256538f2e]
#    to [62c923a3dabf6dc95809fed8a6db87a42a148d08]
# 
============================================================
--- conf/machine/include/zaurus-clamshell.conf	8a8a599f02be15515dfb973930a599edf8a4e5b0
+++ conf/machine/include/zaurus-clamshell.conf	f73532615c93e80eaed263729d26bd685c49d18c
@@ -16,14 +16,11 @@ IMAGE_CMD_jffs2 +=	"; cat ${STAGING_LIBD
                          -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
 
============================================================
--- conf/machine/qemuarm.conf	d3f29105c2eee36c9790874b55a3b41a3cce3654
+++ conf/machine/qemuarm.conf	f52b81d6683cbbc2e15c093b3f14e2fcddede5e7
@@ -11,3 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+MACHINE_TASK_PROVIDER = "task-base"
============================================================
--- conf/machine/spitz.conf	c0bb39b828feec5dc86c26f3a16f626256538f2e
+++ conf/machine/spitz.conf	62c923a3dabf6dc95809fed8a6db87a42a148d08
@@ -6,11 +6,7 @@ PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit $
 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"