aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-02-08 15:47:32 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-02-08 15:47:32 +0000
commit46bb868f542f65434aa7c611fc655cb726ba3022 (patch)
treed2f81b0d2d1bbb6a01d5d0659f0457bb50d43563 /conf
parent85fec8b2edf978b8061fafcb5361bd110782326e (diff)
parent23c6875a205a79525d228125449327af52ff3d8c (diff)
downloadopenembedded-46bb868f542f65434aa7c611fc655cb726ba3022.tar.gz
merge of 'cec78a074a0675e54847a082185ddf501faa9d67'
and 'd5039444b5c22adb43780c8597c4071b78d8f486'
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/machine/x86.conf3
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index fd4830d849..a05cafdc62 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -324,6 +324,8 @@ SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net"
GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone"
GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download"
+GPEPHONE_SVN = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}"
XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
XORG_MIRROR = "http://xorg.freedesktop.org/releases"
GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 91663dfd7c..5b22d01324 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -9,10 +9,11 @@ PACKAGE_EXTRA_ARCHS = "x86"
PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
# todo: convert to task-base
# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_TASK_PROVIDER = "task-base"
-MACHINE_FEATURES = "kernel26 pci usbhost"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
udevdir = "/dev"
OLDEST_KERNEL = "2.6.17"