conf/machine: Merge task-base updates

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@856 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 6cc73c92325eca1f284bd593e6c33ff2f856fcaa..2e22771e4ae7c5546e69b33e174e14adb6b5708b 100644 (file)
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -12,7 +12,6 @@ XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-arm926ejs.conf
@@ -28,11 +27,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 
-#BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
-#${PCMCIA_MANAGER} apm  ppp wireless-tools console-tools"
-
-
+#use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
+
+MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file

diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 2affa6693f45e05898aab49d194ae7ce782e4011..d67acac50fb0117f5f59f37f147532416c1e181c 100644 (file)
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/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/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 63e318908e19e4f610c00864f783e000d3f6b0db..8b7b541f000601711723d6617582e09efc8909a2 100644 (file)
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,3 +15,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file