Sync conf files with OE - includes adding zaurusd to images and fixing PCMCIA_MANAGER handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@327 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 92 insertions, 0 deletions

diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
new file mode 100644
index 0000000000..ce11ddf08c
--- /dev/null
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -0,0 +1,92 @@
+#DISTRO_VERSION = "2006.9"
+DISTRO_VERSION = "test-${DATE}"
+
+include conf/distro/angstrom.conf
+
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
+
+
+FEED_URIS += " \
+		 base##${ANGSTROM_URI}/unstable/feed/base/"
+#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
+#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
+#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+
+#CVSDATE = 20050331
+
+
+# Opie
+include conf/distro/preferred-opie-versions.inc
+
+# GPE
+include conf/distro/preferred-gpe-versions-2.8.inc
+
+# E
+include conf/distro/preferred-e-versions.inc
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
+
+
+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"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+#EABI stuff
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+
+#use EABI toolchain
+PREFERRED_VERSION_gcc ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
+PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
+
+
+PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
+PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
+PREFERRED_VERSION_dbus = "0.61"
+
+
+#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
+
+#### Bootstrap options ####
+
+PCMCIA_MANAGER_c7x0 = "pcmciautils"
+PCMCIA_MANAGER_akita = "pcmciautils"
+PCMCIA_MANAGER_spitz = "pcmciautils"
+PCMCIA_MANAGER_borzoi = "pcmciautils"
+PCMCIA_MANAGER_nokia770 = "pcmciautils"
+PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
+
+#### GPE section ###
+
+#Install libgtkinput in devices without a keyboard
+GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
+GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
+#As soon as a kill switch is in place we can add it to devices with a keyboard
+#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
+#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput"
+
+