From 2d3ea38a2a7fa9189532b0ed9fcee5fffb1eb832 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 16 May 2006 08:53:24 +0000
Subject: angstrom 2006.9: add multiple tarball stashes till we get our own

---
 conf/distro/angstrom-2006.9.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9b03d70219..58d6c2ad38 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -25,6 +25,9 @@ FEED_URIS += " \
 SRCDATE = "20060425"
 SRCDATE_handhelds-pxa-2.6 = "20060506"
 
+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"
-- 
cgit v1.2.3


From 39deb7c94e862b2c709487fa94ad54bbd3cfc358 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 16 May 2006 10:03:02 +0000
Subject: angstrom: adjust angstrom uri

---
 conf/distro/angstrom.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

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>"
-- 
cgit v1.2.3


From 641ecff78a3222facdc0b527966e7b3ee95123dc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 16 May 2006 10:12:40 +0000
Subject: angstrom-2006.9: slide hh.org pxa kernel cvsdate forward a bit

---
 conf/distro/angstrom-2006.9.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 58d6c2ad38..405a48721f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -23,7 +23,7 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 SRCDATE = "20060425"
-SRCDATE_handhelds-pxa-2.6 = "20060506"
+SRCDATE_handhelds-pxa-2.6 = "20060516"
 
 CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
-- 
cgit v1.2.3


From 614fae713de4e9804b3a658f54674dba652250a2 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Tue, 16 May 2006 21:40:52 +0000
Subject: conf/bitbake.conf:     Use -isystem instead of -I for the staging
 incdir.     This will make the staging directory to be the     last one in
 the include chain, this should make all     'local' includes be handled first
 and only then we will     fall back to the staging directory.     nice
 option...

---
 conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2043a500eb..bcff586b82 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}"
-- 
cgit v1.2.3


From a57d7d248644e1dc81dc97e6d03e56ce9e16ed51 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Tue, 16 May 2006 21:44:32 +0000
Subject: conf/bitbake.conf:     Add an alternative OVERRIDES line to enable my
 gcc hacks to     make things fail fast.

---
 conf/bitbake.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index bcff586b82..54815cd0a0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -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.
-- 
cgit v1.2.3


From 74a67d6d75456df40f9f24c1130d664064b43dac Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 11:11:11 +0000
Subject: native.conf: append to ASSUME_PROVIDED, don't override it

---
 conf/machine/native.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'conf')

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"
+
-- 
cgit v1.2.3


From ea2939302bb9fef0b4dc014ae9395d7ab05ee729 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 17 May 2006 11:19:08 +0000
Subject: generic.conf: include preferred opie|gpe|e versions

---
 conf/distro/generic.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'conf')

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
+
-- 
cgit v1.2.3


From b0da47558261c934bf1b0c2aeae37d872142f256 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 18 May 2006 12:43:04 +0000
Subject: angstrom 2006.9: slide srcdate forward to avoid some build problems

---
 conf/distro/angstrom-2006.9.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 405a48721f..9d7c724c8f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -22,8 +22,8 @@ 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 = "20060516"
+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/ \
-- 
cgit v1.2.3


From 1dfe6a3d89e15e0f8bb09570ec7e887a948d86b9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 18 May 2006 14:05:01 +0000
Subject: jlime-donkey: new distro - close #1002

---
 conf/distro/jlime-donkey.conf | 85 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 conf/distro/jlime-donkey.conf

(limited to 'conf')

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}"
+
+
-- 
cgit v1.2.3


From 3dcbefec8c78903f1b5e0d8e52b53afbdf03ef7c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 18 May 2006 17:09:06 +0000
Subject: ezx.conf: add stuff for uclibc builds (uncommented atm.)

---
 conf/distro/ezx.conf | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 2bb392759a..f13a51ee04 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/ \
@@ -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"
 
@@ -49,6 +54,11 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 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
 #
@@ -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
 
-- 
cgit v1.2.3


From e8c0386c00c258ee696a0b1cb3800e0492b80218 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 May 2006 21:16:47 +0000
Subject: ezx.conf: update add openzaurus-unstable-uclibc distro configuration
 for testing...

---
 conf/distro/ezx.conf                        | 2 +-
 conf/distro/openzaurus-unstable-uclibc.conf | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 conf/distro/openzaurus-unstable-uclibc.conf

(limited to 'conf')

diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index f13a51ee04..5a5204b620 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -27,7 +27,7 @@ TARGET_FPU = "soft"
 #            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"
 
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"
-- 
cgit v1.2.3


From c2420f459bde3d91cc8fc4b585e1ba49edb858f0 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 May 2006 22:27:54 +0000
Subject: add a machine configuration and a kernel for the Micrel KS8695 board
 that is commonly found in PePlink manga boards and a lot of wireless media
 streamer boxes first 2.6.16 bits + defconfig. unfortunately the kernel is too
 large for my bootloader and i can't get it more slim, so i have to halt the
 work in this state. perhaps someone wants to pick that up.

---
 conf/machine/ks8695.conf | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 conf/machine/ks8695.conf

(limited to 'conf')

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"
+
-- 
cgit v1.2.3