From 4637243cfecfb9c048bde7a0074a6dac7db6dba4 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Jul 2005 07:49:42 +0000
Subject: Added sources.nslu2-linux.org to nslu2.conf for CVS_TARBALL_STASH and
 MIRRORS_append.

---
 conf/machine/nslu2.conf | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'conf/machine')

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 2ce73ac836..48c1638bd9 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -35,3 +35,10 @@ CVSDATE_gnu-config ?= "20050713"
 CVSDATE_gnu-config-native ?= "20050713"
 CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+
+MIRRORS_append () {
+ftp://.*/.*/	http://sources.nslu2-linux.org/sources/
+http://.*/.*/	http://sources.nslu2-linux.org/sources/
+}
-- 
cgit v1.2.3


From d6f2604e2b0ef3bfd2be6c3a74234d9591ef0854 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Jul 2005 08:02:21 +0000
Subject: Changed nslu2 mirrors to use INHERIT and a .bbclass file instead.

---
 conf/machine/nslu2.conf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'conf/machine')

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 48c1638bd9..3beac45143 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -37,8 +37,4 @@ CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
 
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-
-MIRRORS_append () {
-ftp://.*/.*/	http://sources.nslu2-linux.org/sources/
-http://.*/.*/	http://sources.nslu2-linux.org/sources/
-}
+INHERIT += "nslu2-mirrors"
-- 
cgit v1.2.3


From c73478f79c43eb34e43fd70c33751e02486cc938 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 1 Aug 2005 09:30:14 +0000
Subject: Include Sylpheed and Gaim in the default GPE images.

---
 conf/machine/netvista.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'conf/machine')

diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
-- 
cgit v1.2.3


From 5b8c884361a188ed4bf36b40d4503ae8c3fcfdad Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Aug 2005 10:20:05 +0000
Subject: put miplv6 under a _kernel24 guard, courtesy Philipp Zabel

---
 conf/machine/ipaq-common.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'conf/machine')

diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-- 
cgit v1.2.3