From bc9fa77e7ecf1c84496e90eb3b02e7d01341cda6 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 22 Feb 2006 14:09:20 +0000
Subject: angstrom: use multimachine and splitout images per machine in
 deploy/images

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

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index eaf3fb61e7..3ea5e4553d 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -14,6 +14,9 @@ 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"
@@ -25,6 +28,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')}"
-- 
cgit v1.2.3


From 932b045df7054fa7796910e4683575e8d54b87dd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 23 Feb 2006 13:01:55 +0000
Subject: angstrom: add some more PREFERRED_VERSIONS

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

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index cb4ba04876..0f8fe4e913 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -37,6 +37,10 @@ PREFERRED_PROVIDER_x11=diet-x11
 #PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
 #PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
 
+
+PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
+PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
+
 #
 # Opie
 #
-- 
cgit v1.2.3


From 76945f6290afc35fbb8f23ba907947396e7dd632 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 24 Feb 2006 22:41:46 +0000
Subject: ixp4xx-kernel: Added support for DSM-G600, and updated to
 2.6.16-rc4-git5

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

(limited to 'conf/distro')

diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 3b094d769d..2273aca31a 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-git5"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
-- 
cgit v1.2.3


From 9f6f2893d7e3e56f4e15e4fcd02e4e91b8c39d12 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Sun, 26 Feb 2006 06:28:11 +0000
Subject: unslung.conf: update 6.6-alpha now

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

(limited to 'conf/distro')

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 11445846b2..24adaed1e8 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.6-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-- 
cgit v1.2.3


From 86ce70498fe49f9203417553a449eebab2ea3817 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 27 Feb 2006 02:27:23 +0000
Subject: ixp4xx-kernel: updated to 2.6.16-rc4-git9

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

(limited to 'conf/distro')

diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 2273aca31a..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.16-rc4-git5"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git9"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
-- 
cgit v1.2.3


From 14aa5b2466e9b6bd5642f76c87c1a73deead9994 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Mon, 27 Feb 2006 20:33:47 +0000
Subject: slugos packages: added spca5xx and btsco

---
 conf/distro/slugos-packages.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf/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 \
-- 
cgit v1.2.3


From 433b85a4d262d30969ec14cf14aee1323da9c0a5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Feb 2006 15:15:30 +0000
Subject: angstrom.conf: use -Os by default, see the comments in the file for
 more info

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

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 3ea5e4553d..6503e142da 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -21,6 +21,11 @@ include conf/distro/include/multimachine.conf
 #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"
+
 PARALLEL_INSTALL_MODULES = "1"
 
 BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
-- 
cgit v1.2.3


From f3c738f66b66c663f682f9154b200ffeae89902d Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Wed, 1 Mar 2006 02:23:55 +0000
Subject: unslung-rootfs: unsling fix, empty pcmcia dir fix - unsling script
 fixed for no-automatic mount, updated README and NOTES, change to remove
 empty pcmcia dir

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

(limited to 'conf/distro')

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 24adaed1e8..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.6-alpha"
+DISTRO_VERSION = "6.7-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-- 
cgit v1.2.3


From d22b7761d665052ffaee6a5b8194683e45e2c43e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 1 Mar 2006 22:16:45 +0000
Subject: angstrom: prefer softfloat till we get proper eabi

---
 conf/distro/angstrom.conf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 6503e142da..a68adaae42 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -26,6 +26,9 @@ TARGET_OS = "linux"
 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"
-- 
cgit v1.2.3


From 5cd2591678a3265b4a29af3d8764cec060f4afbf Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Mar 2006 10:30:04 +0000
Subject: angstrom-2006.9: move some preferred providers around so angstrom can
 override stuff in includes like e17 defining a gcc version (WTF?)

---
 conf/distro/angstrom-2006.9.conf | 49 +++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 0f8fe4e913..338e0ff17e 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -16,6 +16,25 @@ FEED_URIS += " \
 
 #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"
@@ -41,29 +63,4 @@ PREFERRED_PROVIDER_x11=diet-x11
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
 
-#
-# 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_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
 
-- 
cgit v1.2.3


From 3326b01658a2c98c72e455e53167ba7f252c3209 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Mar 2006 15:47:25 +0000
Subject: angstrom-2006.9: fix stupid error in feed uris

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

(limited to 'conf/distro')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 338e0ff17e..4bb27afa51 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -10,9 +10,9 @@ 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
 
@@ -32,7 +32,7 @@ PREFERRED_VERSION_qte = "2.3.10"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_libx11 = "diet-x11"
+#PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-- 
cgit v1.2.3