summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-12-12 12:24:17 +0000
committerGraeme Gregory <dp@xora.org.uk>2006-12-12 12:24:17 +0000
commitada8de47c0371621a7906edcc624556f21e785ee (patch)
treef2757a903c09ae7045d10b67951b14507bb0b5ca /conf
parenta004355ef9e8378dc8e6289c0aff189997c7c6db (diff)
parentba78f0c9d4eeec88326869d3dd48aebe1cd32969 (diff)
merge of '19860068438a3f48413a2f40e4032ce5e8c1fe7d'
and 'a5b842809a85562e0154b206660598c3b851094c'
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/machine/compulab-pxa270.conf2
-rw-r--r--conf/machine/efika.conf1
-rw-r--r--conf/machine/logicpd-pxa270.conf2
-rw-r--r--conf/machine/x86.conf6
5 files changed, 11 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b06e2bb3d4..c9b25f7c9e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -319,7 +319,7 @@ export palmqtdir = "/opt/QtPalmtop"
GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
+SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index b49bf48d07..12f82773d4 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -19,4 +19,6 @@ ROOT_FLASH_SIZE = "32"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index d2a0e542d8..5b2c87b55c 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -6,6 +6,7 @@
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index dc41e7c2fd..8fd58bb5ed 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -24,4 +24,6 @@ ROOT_FLASH_SIZE = "32"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index b2147f2c0d..91663dfd7c 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -8,7 +8,11 @@ TARGET_ARCH = "i486"
PACKAGE_EXTRA_ARCHS = "x86"
PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
# todo: convert to task-base
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+MACHINE_FEATURES = "kernel26 pci usbhost"
udevdir = "/dev"
OLDEST_KERNEL = "2.6.17"