diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-04-23 16:29:33 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-23 16:29:33 +0000 |
commit | e99fa15bdf99ddef110d2ed419e3f67fd47c94de (patch) | |
tree | 2a3690502be250dfe49147ed1cd020e7b7b24b06 /conf/distro/angstrom-2006.9.conf | |
parent | 4aeb84024a17e85836869b257b682fabedee1917 (diff) | |
parent | 43a499b782367210547e21c1f3e8aabdbcd2d29c (diff) |
merge of d23a51fd3de55ab7bd14228f1701651fb28530e6
and e399d3faf8861b253531bf4ec2dbec4e5ea1af2b
Diffstat (limited to 'conf/distro/angstrom-2006.9.conf')
-rw-r--r-- | conf/distro/angstrom-2006.9.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4506881018..5d77335a86 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -25,6 +25,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 @@ -33,6 +36,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" |