Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/23 08:41:50-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 16:34:02+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/03/23 16:32:05+00:00 rpsys.net!RP
openzaurus-2.6: fix typo

2005/03/23 17:31:58+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/03/23 17:31:35+01:00 local!hrw
updated kdepimpi to 2.0.20

2005/03/23 07:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 16:38:17+01:00 zeckescompany.nl!alwin
changed package-dep for meta-opie

2005/03/24 00:32:02+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/24 00:31:35+10:30 (none)!rwhitby
Made Unslung *not* create ramdisk for /var and /dev when you've unslung to an external disk

2005/03/23 05:41:22-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:15:58+10:30 (none)!rwhitby
Fixed the unslung patch for rc.1

2005/03/24 00:06:41+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/24 00:06:21+10:30 (none)!rwhitby
Unslung 4.7-alpha, with support for external disks on sda1, sda2, sdb1, sdb2.

2005/03/23 14:26:04+01:00 uni-frankfurt.de!mickeyl
rename wlan-ng-modules package per upstream changes

2005/03/23 14:23:31+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/23 14:23:20+01:00 uni-frankfurt.de!mickeyl
add remind, a console PIM application. in nonworking, because it needs a gcc3.x patch

2005/03/23 04:41:30-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 13:34:56+01:00 mn-solutions.de!schurig
Various twiddles for MNCI "Ramses":
qmake-native: remove my weird attempt to get things right, it was very wrong :-)
gdb: add REPENDS on libthread-db1 to allow debugging of threaded Qt/E 3.x apps
kernel: add bluez-modules
sysvinit: make startup even faster by removing access to /proc/progress


2005/03/23 03:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 22:12:18+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/23 22:11:52+10:30 (none)!rwhitby
Added lots of modules for traffic shaping and other various things to OpenSlug kernel

2005/03/23 12:14:09+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/03/23 12:13:44+01:00 (none)!br1
fixed hostapd 0.3.7 and added wpa_supplicant 0.3.8

2005/03/23 11:41:30+01:00 uni-frankfurt.de!mickeyl
remove hostap-daemon from nonworking. hey folks, please look if not already there is a nonworking version before you add a new one

2005/03/23 02:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 11:38:09+01:00 uni-frankfurt.de!mickeyl
opie-collections: add datebook plugins to standard opie image

2005/03/23 11:35:44+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/23 11:33:22+01:00 uni-frankfurt.de!mickeyl
add newer gpsd versions and a fixed start/stop script

2005/03/23 11:31:34+01:00 uni-frankfurt.de!mickeyl
opie packaging changes in meta-opie and opie-login

2005/03/23 11:06:47+01:00 (none)!br1
added packages "ser" and "mystun" contributed by Sven-Ola Tuecke

2005/03/23 11:02:05+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/03/22 17:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/23 01:26:50+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/03/23 01:26:05+00:00 (none)!cwiiis
Use the sourceforge source for freetype, as it seems to be the primary download location now.

2005/03/23 01:24:53+00:00 (none)!cwiiis
Small gpe-related updates to openzaurus-3.5.3.conf.

2005/03/23 01:23:49+00:00 (none)!cwiiis
Correct XLIBS_MIRROR

2005/03/22 07:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/22 16:31:48+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/22 16:31:38+01:00 uni-frankfurt.de!mickeyl
libqte2: set package arch to machine arch since we supply machine specific patches and flags

2005/03/22 15:11:11+00:00 (none)!cwiiis
Use ?= instead of = in conf/distro/preferred-gpe-versions.inc, so as not to override user-specified settings

2005/03/22 22:57:38+10:30 (none)!rwhitby
Bumped the Openslug kernel PR

2005/03/22 22:53:49+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/22 22:53:07+10:30 (none)!rwhitby
Changed CONFIG_ATALK from =y to =m in Unslung kernel

2005/03/22 03:41:21-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/22 12:30:28+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/22 12:30:12+01:00 uni-frankfurt.de!mickeyl
include tune-xscale in the pxa machines. root file systems can be built with all optimizations since they are machine specific anyway. the unified feed though needs to be built using a tune-strongarm based machine configuration

2005/03/22 12:28:44+01:00 local!hrw
added qpf-gentium font to meta-opie

2005/03/22 12:27:20+01:00 local!hrw
updated qpf-dejavufonts to 1.8
added all rotations

2005/03/22 12:26:15+01:00 local!hrw
added all rotations to qpf-hunkyfonts

2005/03/22 12:09:08+01:00 uni-frankfurt.de!mickeyl
add qpf-gentium, a free font with lots of characters. thanks hrw for converting.

2005/03/22 10:39:58+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/22 00:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/22 07:43:44+00:00 reciva.com!pb
change "h2200_linear" to "linear_h2200".
Reported by Matt Reimer.

2005/03/21 17:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/22 01:56:50+01:00 dyndns.org!reenoo
libglade: update to 2.4.2 which fixes improper use of the toolbar API. make no-xml2.patch apply against 2.4.2.

2005/03/22 00:59:21+01:00 uni-frankfurt.de!mickeyl
split tosa machine configuration into generic, 2.4, 2.6 parts

2005/03/22 00:54:55+01:00 uni-frankfurt.de!mickeyl
add a version of orinoco-0.13e that compiles against kernel 2.6 and choose that version for the clamshells and the poodle

2005/03/18 16:13:17+01:00 (none)!br1
added madwifi BSD branch build

2005/03/18 16:12:01+01:00 (none)!br1
added hostap-daemon 0.3.7

BKrev: 4241c03fA7V8WMbGM7hnEqx17eXRkw

11 files changed, 95 insertions, 100 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2b99e29b0a..ff3c6348e2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -288,7 +288,7 @@ GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge"
 GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
-XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release"
+XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs"
 
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 3b7aa1994e..f051f7b5ad 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -47,9 +47,8 @@ include conf/distro/preferred-opie-versions.inc
 # GPE
 #
 
-CVSDATE_xserver-kdrive = "20050208"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 
 include conf/distro/preferred-gpe-versions.inc
 
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 0851c2e696..f33302d741 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -6,74 +6,74 @@
 #CVSDATE_xserver-kdrive=20050207
 
 #specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox = "1.6"
-PREFERRED_VERSION_matchbox = "0.9.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1"
-PREFERRED_VERSION_matchbox-wm = "0.9.3"
-PREFERRED_VERSION_matchbox-panel = "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_gtk+ = "2.6.3"
-PREFERRED_VERSION_libgpewidget = "0.97"
-PREFERRED_VERSION_libgpepimc = "0.4"
-PREFERRED_VERSION_libgpevtype = "0.11"
-PREFERRED_VERSION_libschedule = "0.14"
-PREFERRED_VERSION_gpe-icons = "0.24"
-PREFERRED_VERSION_libgsm = "1.0.10"
-#PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "5.3"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xextensions = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.76"
-PREFERRED_VERSION_gpe-session-scripts = "0.62"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.50"
-PREFERRED_VERSION_gpe-calendar = "0.61"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.36"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.23"
-PREFERRED_VERSION_gpe-bluetooth = "0.38"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.22"
-PREFERRED_VERSION_gpe-clock = "0.20"
-PREFERRED_VERSION_gpe-mininet = "0.5"
-PREFERRED_VERSION_gpe-mixer = "0.40"
-PREFERRED_VERSION_gpe-shield = "0.7"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.47"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.2"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.33"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.13"
-#PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.2"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "1.0"
+PREFERRED_VERSION_libmatchbox ?= "1.6"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_gtk+ ?= "2.6.3"
+PREFERRED_VERSION_libgpewidget ?= "0.97"
+PREFERRED_VERSION_libgpepimc ?= "0.4"
+PREFERRED_VERSION_libgpevtype ?= "0.11"
+PREFERRED_VERSION_libschedule ?= "0.14"
+PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+#PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.14"
+PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.76"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.50"
+PREFERRED_VERSION_gpe-calendar ?= "0.61"
+PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+PREFERRED_VERSION_gpe-contacts ?= "0.36"
+PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+PREFERRED_VERSION_gpe-su ?= "0.18"
+PREFERRED_VERSION_gpe-conf ?= "0.1.22"
+PREFERRED_VERSION_gpe-clock ?= "0.20"
+PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-mixer ?= "0.40"
+PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.47"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.28"
+PREFERRED_VERSION_gpe-gallery ?= "0.95"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-filemanager ?= "0.20"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.19"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
 
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index df20c0647a..35f1de8ec4 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -2,10 +2,12 @@
 #@NAME: Unslung 
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
-FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable"
+FEED_URIS_cross = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross"
+FEED_URIS_native = "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
+FEED_URIS_oe = "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "4.5-alpha"
+DISTRO_VERSION = "4.7-alpha"
 DISTRO_TYPE = "beta"
 
 TARGET_FPU = "soft"
diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf
index e69de29bb2..72a751d19e 100644
--- a/conf/machine/poodle-2.6.conf
+++ b/conf/machine/poodle-2.6.conf
@@ -0,0 +1,6 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_orinoco-modules = "0.13e-26"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 458ee554bd..3bd9f5f076 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -14,8 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa-2.4.conf
diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa-2.6.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index be495925c1..f742bed742 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,24 +4,9 @@
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
-			    orinoco-modules sharp-sdmmc-support usbutils"
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
-			     kernel-module-evdev kernel-module-net-fd \
-			     kernel-module-pxa-bi kernel-module-registers \
-			     kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
-			     kernel-module-usb-storage \
-			     kernel hostap-modules-cs orinoco-modules-cs \
-			     sharp-sdmmc-support kernel-module-pxa-bi \
-			     kernel-module-ip-gre \
-			     kernel-module-irnet kernel-module-ipip kernel-module-usbcore \
-			     kernel-module-usbdcore kernel-module-usbdmonitor"
-
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
-		kernel-module-usbmouse kernel-module-hid usbutils \
-		kernel-module-evdev"
+
+KERNEL_VERSION ?= "2.4"
+include conf/machine/tosa-${KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
@@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 530d12af0b..e408c5c86e 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -1,6 +1,6 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-PREFERRED_VERSION_orinoco-modules = "cvs"
+PREFERRED_VERSION_orinoco-modules = "0.13e-26"
 
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
 pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index 9246d45197..e0b8d31349 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -16,7 +16,8 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"