angstrom-2006.9: add some safeguards

* select kernel 2.6 for zaurus and iPAQs (KERNEL and ZKERNEL_VERSION)
* zap contents of GPE_EXTRA_INSTALL

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4cfea8e..c91437f 100644 (file)
--- 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"