summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-04-23 12:18:59 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-23 12:18:59 +0000
commita11d7da5cf3f6a57ff01a15173a5bfa99f74c382 (patch)
treefe1ea6061e03f3908612a84356e84ac837350fbc /conf/distro
parentce83245863a25f24c0182a8bb97d7418b6554e5f (diff)
angstrom-2006.9: add some safeguards
* select kernel 2.6 for zaurus and iPAQs (KERNEL and ZKERNEL_VERSION) * zap contents of GPE_EXTRA_INSTALL
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2006.9.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4cfea8e3da..c91437f54f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -23,6 +23,9 @@ include conf/distro/preferred-opie-versions.inc
# GPE
include conf/distro/preferred-gpe-versions-2.8.inc
+#zap extra stuff taking place in $MACHINE.conf
+GPE_EXTRA_INSTALL = ""
+
# E
include conf/distro/preferred-e-versions.inc
@@ -31,6 +34,10 @@ PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
PREFERRED_PROVIDER_libx11 = "diet-x11"
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+ZKERNEL_VERSION = "2.6"
+
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"