9 files changed, 150 insertions, 13 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2043a500eb..54815cd0a0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -239,9 +239,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
 # Build flags and options.
 ##################################################################
 
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -383,6 +383,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 #
 # This works for  functions as well, they are really just environment variables.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
 
 ##################################################################
 # Include the rest of the config files.
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9b03d70219..9d7c724c8f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -22,9 +22,12 @@ FEED_URIS += " \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
-SRCDATE = "20060425"
-SRCDATE_handhelds-pxa-2.6 = "20060506"
+SRCDATE = "20060518"
+#SRCDATE_handhelds-pxa-2.6 = "20060516"
 
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
 
 # Opie
 #use 1337 mt version of opie to have a webbrowser
@@ -83,7 +86,7 @@ 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"
-PREFERRED_VERSION_gstreamer ?= "0.10.5"
+PREFERRED_VERSION_gstreamer ?= "0.10.6"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
 PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index a94fcee140..403b13934f 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -5,8 +5,8 @@
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
-#we'll use this till we get a real domain
-ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
+#Use this variable in feeds and other parts that need a URI
+ANGSTROM_URI = "http://www.angstrom-distribution.org/"
 
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 2bb392759a..5a5204b620 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -10,8 +10,13 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}"
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
 
-include conf/distro/openzaurus.conf
+INHERIT += " package_ipk debian"
 
+# libc setting:
+# specify whether you want a glibc or uclibc based distribution
+#TARGET_OS = "linux-uclibc"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
 
 #FEED_URIS += " \
 #           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
@@ -22,7 +27,7 @@ include conf/distro/openzaurus.conf
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-SRCDATE = "20060507"
+SRCDATE ?= "20060507"
 
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
 
@@ -31,7 +36,7 @@ KERNEL_CONSOLE = "ttyS0"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 
-# fix some iconv issues, needs to be adjusted when doing uclibc builds
+# fix some iconv issues, needs to be commented out when doing uclibc builds
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
@@ -50,6 +55,11 @@ PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 
 #
+# Utilities
+#
+BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native"
+
+#
 # Opie
 #
 QTE_VERSION = "2.3.10"
@@ -60,7 +70,7 @@ include conf/distro/preferred-opie-versions.inc
 #
 # GPE
 #
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
 include conf/distro/preferred-gpe-versions-2.8.inc
 
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 768f88d243..59e003f9b3 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -6,3 +6,11 @@ INHERIT += " package_ipk debian"
 TARGET_OS = "linux"
 # TARGET_FPU = "soft"
 IMAGE_FSTYPES = "ext2.gz"
+
+DISTRO_NAME = "GenericDistribution"
+DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+
+require conf/distro/preferred-gpe-versions.inc
+require conf/distro/preferred-opie-versions.inc
+require conf/distro/preferred-e-versions.inc
+
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
new file mode 100644
index 0000000000..1871af384b
--- /dev/null
+++ b/conf/distro/jlime-donkey.conf
@@ -0,0 +1,85 @@
+#@TYPE: Distribution
+#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
+#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
+#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
+
+DISTRO = "Jornada Linux Mobility Edition"
+DISTRO_NAME = "JLime"
+DISTRO_VERSION = "Donkey"
+DISTRO_TYPE = "Beta"
+
+export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/Releases/donkey/${TARGET_ARCH}/feed/"
+
+#<>
+#<> We will set CVS DATE when things are known to work.
+#<>
+#SRCDATE = "20060516"
+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_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+
+#<>
+#<>We want kdrive as our default X-Server.
+#<>
+PREFERRED_PROVIDER_xserver        = "xserver-kdrive"
+
+#<>
+#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
+#<>
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
+PREFERRED_VERSION_gcc = "3.4.4"
+PREFERRED_VERSION_gcc-cross = "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
+PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
+PREFERRED_VERSION_glibc-initial = "2.3.2"
+
+#<>
+#<>Setting Preferred glib-2.0,glib-1.2
+#<>
+PREFERRED_VERSION_glib-2.0-native = "2.6.5"
+PREFERRED_VERSION_glib-1.2-native = "1.2.10"
+PREFERRED_VERSION_glib-2.0 = "2.8.4"
+PREFERRED_VERSION_glib-1.2 = "1.2.10"
+
+#<>
+#<>Setting Preferred xserver-kdrive
+#<>
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
+
+#<>
+#<>Other Specific stuff.
+#<>
+INHERIT += "package_tar package_ipk"
+BBINCLUDELOGS = "yes"
+IMAGE_FSTYPES = "tar.bz2"
+TARGET_OS = "linux"
+
+#<>
+#<>What we want on the bootstrap image (extra)
+#<>
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils"
+BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-tools coreutils"
+
+#<>
+#<>What Opie version should we use.
+#<>
+OPIE_VERSION = "1.2.2"
+include conf/distro/preferred-opie-versions.inc  
+
+#<>
+#<>We want to be able to build this for all jornadas so
+#<>to not mess up the folders we need to make them dynamic.
+#<>It will use different folders depending on Arch (set in local.conf)
+include conf/distro/include/multimachine.conf
+
+#<>
+#<>Our Image files should look abit better.
+#<>
+#<>
+IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
+
+
diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf
new file mode 100644
index 0000000000..6ff43f565a
--- /dev/null
+++ b/conf/distro/openzaurus-unstable-uclibc.conf
@@ -0,0 +1,9 @@
+require conf/distro/openzaurus-unstable.conf
+
+TARGET_OS = "linux-uclibc"
+PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
+PREFERRED_PROVIDER_virtual/libintl = "libintl"
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
+# NOTE: you have to rename your 2.95 gcc and 2.11.2 ld
+ASSUME_PROVIDED += "virtual/arm-linux-uclibc-gcc-2.95"
diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf
new file mode 100644
index 0000000000..a3e7509e29
--- /dev/null
+++ b/conf/machine/ks8695.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Micrel KS8695(P) Development Platform
+#@DESCRIPTION: Machine configuration for Micrel KS8695(P) Development Platform
+#@SPECS: http://www.micrel.com/_PDF/Ethernet/ks8695.pdf
+#@DEVICES: PePLink MANGA Triple Balance, Telegent TG100
+
+TARGET_ARCH = "arm"
+
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+require conf/machine/include/tune-arm920t.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "8"
+
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
index b28565316f..4817b2e3f1 100644
--- a/conf/machine/native.conf
+++ b/conf/machine/native.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Build Station
-#@DESCRIPTION: Machine configuration for your build station.
+#@DESCRIPTION: Machine configuration for your build station
 
 TARGET_ARCH = "${BUILD_ARCH}"
 IPKG_ARCHS = "all ${TARGET_ARCH}"
@@ -8,5 +8,6 @@ TARGET_PREFIX = ""
 VENDOR = "-oe"
 
 PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED = "virtual/gcc-initial virtual/gcc virtual/g++"
+ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++"
 ASSUME_PROVIDED += "binutils-cross"
+