12 files changed, 18 insertions, 32 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index 0b0caebb3c..27695be4bb 100644
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 IMAGE_FSTYPES ?= "jffs2"
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 4b1d8edb80..893378f569 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf
index e545bbc1c0..190ebe1c8c 100644
--- a/meta/conf/machine/include/ixp4xx.conf
+++ b/meta/conf/machine/include/ixp4xx.conf
@@ -141,28 +141,12 @@ PACKAGE_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 		bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \
 		${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}"
 
-# PACKAGE_ARCH_LIST [not used]
+# IPKG_ARCH_LIST [not used]
 #    This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing
 #    the removal of the raw "${MACHINE}" from the end of the list.  ${MACHINE} and
 #    ixp4xx are included at the start (lower priority) as the non-byte-sex specific
 #    versions.
-PACKAGE_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}"
-
-#-------------------------------------------------------------------------------
-# Package versions
-#-------------------------------------------------------------------------------
-# Warning: these are shared across the different machine and distro
-# configurations but can be overridden therein if required.
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
 # Board defaults
diff --git a/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf
index eff0ad4c7c..01a06b7c27 100644
--- a/meta/conf/machine/include/poodle-2.6.conf
+++ b/meta/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-clamshell-2.6.conf
+require conf/machine/include/zaurus-2.6.conf
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
index c896c38f57..83ddf24b87 100644
--- a/meta/conf/machine/include/qemu.conf
+++ b/meta/conf/machine/include/qemu.conf
@@ -1,6 +1,7 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
 
diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf
index 6831b0ea91..f3591b4b75 100644
--- a/meta/conf/machine/include/tosa-2.6.conf
+++ b/meta/conf/machine/include/tosa-2.6.conf
@@ -1,4 +1,4 @@
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 # wlan-ng Modules
 MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf
index 992f1923c6..373bf46727 100644
--- a/meta/conf/machine/include/tune-arm920t.conf
+++ b/meta/conf/machine/include/tune-arm920t.conf
@@ -1,3 +1,3 @@
 PACKAGE_ARCH = "armv4t" 
-TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t"
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
diff --git a/meta/conf/machine/include/tune-arm9tdmi.conf b/meta/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad1c1..d097b07739 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.conf
+++ b/meta/conf/machine/include/tune-arm9tdmi.conf
@@ -1 +1,2 @@
+PACKAGE_ARCH = "armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.conf
index f9c8e7f5cf..8376faca74 100644
--- a/meta/conf/machine/include/tune-iwmmxt.conf
+++ b/meta/conf/machine/include/tune-iwmmxt.conf
@@ -1,6 +1,6 @@
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
 TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH = "iwmmxt"
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-2.6.conf
index e0a9e38e91..ce9b44c9fe 100644
--- a/meta/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/meta/conf/machine/include/zaurus-2.6.conf
@@ -6,10 +6,10 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
-MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
-MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2"
-
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
+MACHINE_FEATURES_append_akita = " usbhost "
+MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
 MACHINE_EXTRA_RDEPENDS = "zaurusd"
 MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
-MACHINE_TASK_PROVIDER = "task-base"
-\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 2e22771e4a..6bde574d02 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
@@ -33,4 +33,4 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
-MACHINE_TASK_PROVIDER = "task-base"
-\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index cf2c5f3f4f..2c4e10935e 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
 include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-2.6.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"