explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'

              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'

5 files changed, 44 insertions, 30 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index cb4ba04876..4bb27afa51 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -10,12 +10,31 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-        base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
-		${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
-        updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+        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"
@@ -25,8 +44,11 @@ PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
 #EABI stuff
 #PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_gcc ?= "4.0.2"
+PREFERRED_VERSION_gcc-cross ?= "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
+
 
-PREFERRED_PROVIDER_x11=diet-x11
 
 #use EABI toolchain
 #PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
@@ -37,29 +59,8 @@ PREFERRED_PROVIDER_x11=diet-x11
 #PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
 #PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
 
-#
-# 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
-
-#
-# GPE
-#
+PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
+PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
 
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
-
-include conf/distro/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-
-include conf/distro/preferred-e-versions.inc
 
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index eaf3fb61e7..a68adaae42 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -14,10 +14,21 @@ MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>"
 #use ipkg package format with debian style naming
 INHERIT += "package_ipk debian"
 
+#use multimachine buildrules 
+include conf/distro/include/multimachine.conf
+
 #EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime
 #TARGET_OS = "none-linux-gnueabi"
 TARGET_OS = "linux"
 
+#mess with compiler flags to use -Os instead of -O2
+#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
+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"
 
 BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
@@ -25,6 +36,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-
+DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index b9ac309a60..f05dd23e81 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -16,6 +16,7 @@ ${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/bogofilter/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
+${PKGDIR}/packages/btsco/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
 ${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
@@ -198,6 +199,7 @@ ${PKGDIR}/packages/setserial/*.bb \
 ${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/slugos-init/*.bb \
+${PKGDIR}/packages/spca5xx/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 3b094d769d..cf2cb078c5 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -170,7 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.2"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git9"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 11445846b2..e130ae09cf 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.5-alpha"
+DISTRO_VERSION = "6.7-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"