summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-16 14:21:55 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-16 14:21:55 +0000
commit274eccaf5a02e1bc6d70876c84eb68ac6ae343c2 (patch)
treed70f07417d7760fa5470a5ce2348a026adc66637 /meta/conf
parent5962332b14515914dbe485892cd0d849e3b8543b (diff)
downloadpoky-274eccaf5a02e1bc6d70876c84eb68ac6ae343c2.tar.gz
poky-274eccaf5a02e1bc6d70876c84eb68ac6ae343c2.tar.bz2
poky-274eccaf5a02e1bc6d70876c84eb68ac6ae343c2.zip
conf/machine: Merge task-base updates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@856 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/nokia770.conf8
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 7 insertions, 5 deletions
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 6cc73c9232..2e22771e4a 100644
--- 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 2affa6693f..d67acac50f 100644
--- 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 63e318908e..8b7b541f00 100644
--- 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