[oe-commits] org.oe.dev collie: converted to task-base

[hrw commit]

collie: converted to task-base

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b0f2d6bbf93ca249d8e78fdc53fbf483e6b818f7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b0f2d6bbf93ca249d8e78fdc53fbf483e6b818f7
Files:
1
conf/machine/collie.conf
Diffs:

#
# mt diff -r7d963e964e936eba57b2b0077da51b9a869407b4 -rb0f2d6bbf93ca249d8e78fdc53fbf483e6b818f7
#
# 
# 
# patch "conf/machine/collie.conf"
#  from [2d477ae4e4a70d880bbc9531c98cdf9e59970417]
#    to [0190bba209cd7c4ddc5432901d297315c6900880]
# 
============================================================
--- conf/machine/collie.conf	2d477ae4e4a70d880bbc9531c98cdf9e59970417
+++ conf/machine/collie.conf	0190bba209cd7c4ddc5432901d297315c6900880
@@ -5,16 +5,20 @@ PREFERRED_PROVIDER_virtual/kernel ?= "co
 TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs  \
-sharp-sdmmc-support" 
-BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor \
-altboot"
 
+#
+# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
+# no usbgadget feature because 2.4 kernel handle it in own way on each machine
+#
+MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support"
+
 # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
 
 # This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
@@ -29,3 +33,5 @@ PREFERRED_VERSION_orinoco-modules = "0.1
 
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+MACHINE_TASK_PROVIDER = "task-base"