Merge distro files from OE

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

4 files changed, 48 insertions, 34 deletions

diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
index 0eeefcec72..c80a574a0d 100644
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -3,7 +3,6 @@ DISTRO_VERSION = "test-${DATE}"
 
 include conf/distro/angstrom.conf
 
-
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
@@ -15,27 +14,35 @@ FEED_URIS += " \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
-#CVSDATE = 20050331
+SRCDATE = "20060425"
+SRCDATE_handhelds-pxa-2.6 = "20060506"
 
 
 # Opie
+#use 1337 mt version of opie to have a webbrowser
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+QTE_VERSION = "2.3.10"
+OPIE_VERSION = "1.2.2"
 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
 
-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"
 
 
+#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"
@@ -44,7 +51,7 @@ 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-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
 
@@ -52,19 +59,31 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 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_binutils ?= "2.16.91.0.7"
+PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
+# To use an EABI compatible version 3 series gcc, either uncomment 
+# the lines below or set them in local.conf: 
+#
+# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
+# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus = "0.61"
+PREFERRED_VERSION_dbus ?= "0.61"
+PREFERRED_VERSION_gstreamer ?= "0.10.5"
 
+PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
+PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
+PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
+PREFERRED_VERSION_hostap-modules ?= "0.4.7"
 
 #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
+# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad
 
 #### Bootstrap options ####
 
@@ -72,15 +91,21 @@ PCMCIA_MANAGER_c7x0 = "pcmciautils"
 PCMCIA_MANAGER_akita = "pcmciautils"
 PCMCIA_MANAGER_spitz = "pcmciautils"
 PCMCIA_MANAGER_nokia770 = "pcmciautils"
+PCMCIA_MANAGER_h2200 = "pcmciautils"
+PCMCIA_MANAGER_h6300 = "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_h6300 = " 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"
diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf
index e9e05201e8..a94fcee140 100644
--- a/openembedded/conf/distro/angstrom.conf
+++ b/openembedded/conf/distro/angstrom.conf
@@ -18,12 +18,13 @@ INHERIT += "package_ipk debian"
 include conf/distro/include/multimachine.conf
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= ""
 
 
 #Use the ARM EABI when building for an ARM cpu. We can't use overrides
 #here because this breaks all places where ":=" is used.
-TARGET_VENDOR = "${@['','-none'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 
 #mess with compiler flags to use -Os instead of -O2
@@ -31,14 +32,12 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
 
-#EABI is softfloat by default, but let's make sure :)
-TARGET_FPU = "soft"
-
-PARALLEL_INSTALL_MODULES = "1"
+#ARM EABI is softfloat by default, but let's make sure :)
+TARGET_FPU_arm = "soft"
 
 #Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index ab367378af..8b40c5811a 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -5,7 +5,6 @@ DISTRO_VERSION = "unstable-${DATE}"
 
 include conf/distro/familiar.conf
 
-
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 #!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
@@ -39,7 +38,6 @@ PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
 PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 
 
-
 # The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault
@@ -57,9 +55,6 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 # Opie
 #
 
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
 #OPIE_VERSION = "1.2.1"
 #include conf/distro/preferred-opie-versions.inc
 
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index 1143f1d940..cc87380494 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -21,26 +21,20 @@ DISTRO_TYPE = "debug"
 #
 
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
+PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
 
 KERNEL_CONSOLE = "ttyS0"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-
-PREFERRED_VERSION_hostap-modules ?= "0.3.9"
-
-#fix some iconv issues, needs to be adjusted when doing uclibc builds
+# fix some iconv issues, needs to be adjusted when doing uclibc builds
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
-
 #
 # Base
 #
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 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"
@@ -48,10 +42,11 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 # Opie
 #
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-
-#OPIE_VERSION = "1.2.1"
-#include conf/distro/preferred-opie-versions.inc
+QTE_VERSION = "2.3.10"
+OPIE_VERSION = "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT = "no"
+#PALMTOP_USE_MULTITHREADED_QT = "yes"
+include conf/distro/preferred-opie-versions.inc
 
 #
 # GPE