merge of 44ef2a80f1407b2958e8f750892482362d9bb352

     and d6ed8bd922639d616c17c01d270e9edf2bc6b517

18 files changed, 260 insertions, 68 deletions

diff --git a/conf/distro/ludeos-packages.conf b/conf/distro/ludeos-packages.conf
new file mode 100644
index 0000000000..97b152b445
--- /dev/null
+++ b/conf/distro/ludeos-packages.conf
@@ -0,0 +1,2 @@
+OPENSLUG_EXTRA_BBFILES = ""
+include conf/distro/openslug-packages.conf
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
new file mode 100644
index 0000000000..d03e8dd409
--- /dev/null
+++ b/conf/distro/ludeos.conf
@@ -0,0 +1,23 @@
+#@TYPE: Distribution
+#@NAME: DeLude
+#@DESCRIPTION: LudeOS Linux Distribution for the Iomega NAS 100d
+
+DISTRO_NAME    = "LudeOS"
+DISTRO_VERSION = "0.1-alpha"
+DISTRO_FEED    = "unstable"
+DISTRO_TYPE    = "beta"
+
+ARCH_BYTE_SEX = "be"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
+
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}"
+
+PREFERRED_PROVIDER_virtual/kernel = "nas100d-kernel"
+# PREFERRED_VERSION_nas100d-kernel ?= "2.6.15-rc2"
+
+# This removes the dependency on upslug2-native.
+SLUGOS_NATIVE_DEPENDS = ""
+
+include conf/distro/slugos.conf
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 67bfc2f16c..ea126d9032 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -19,6 +19,7 @@ ${PKGDIR}/packages/busybox/*.bb \
 ${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
 ${PKGDIR}/packages/ccxstream/*.bb \
+${PKGDIR}/packages/cherokee/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
@@ -33,9 +34,12 @@ ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/diffutils/*.bb \
 ${PKGDIR}/packages/dnsmasq/*.bb \
+${PKGDIR}/packages/docbook-utils/*.bb \
 ${PKGDIR}/packages/dropbear/*.bb \
+${PKGDIR}/packages/dsniff/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
 ${PKGDIR}/packages/expat/*.bb \
+${PKGDIR}/packages/ez-ipupdate/*.bb \
 ${PKGDIR}/packages/fakeroot/*.bb \
 ${PKGDIR}/packages/file/*.bb \
 ${PKGDIR}/packages/findutils/*.bb \
@@ -84,6 +88,8 @@ ${PKGDIR}/packages/libid3tag/*.bb \
 ${PKGDIR}/packages/liblockfile/*.bb \
 ${PKGDIR}/packages/libmad/*.bb \
 ${PKGDIR}/packages/libmikmod/*.bb \
+${PKGDIR}/packages/libnet/*.bb \
+${PKGDIR}/packages/libnids/*.bb \
 ${PKGDIR}/packages/libogg/*.bb \
 ${PKGDIR}/packages/libol/*.bb \
 ${PKGDIR}/packages/libpcap/*.bb \
@@ -104,6 +110,7 @@ ${PKGDIR}/packages/make/*.bb \
 ${PKGDIR}/packages/makedevs/*.bb \
 ${PKGDIR}/packages/man-pages/*.bb \
 ${PKGDIR}/packages/man/*.bb \
+${PKGDIR}/packages/masqmail/*.bb \
 ${PKGDIR}/packages/mdadm/*.bb \
 ${PKGDIR}/packages/meta/*.bb \
 ${PKGDIR}/packages/mgetty/*.bb \
@@ -126,14 +133,17 @@ ${PKGDIR}/packages/netbase/*.bb \
 ${PKGDIR}/packages/netpbm/*.bb \
 ${PKGDIR}/packages/nfs-utils/*.bb \
 ${PKGDIR}/packages/nis/*.bb \
+${PKGDIR}/packages/nmap/*.bb \
 ${PKGDIR}/packages/nslu2-binary-only/*.bb \
 ${PKGDIR}/packages/ntp/*.bb \
 ${PKGDIR}/packages/obexftp/*.bb \
+${PKGDIR}/packages/openjade/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
 ${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openobex/*.bb \
 ${PKGDIR}/packages/openslug-init/*.bb \
+${PKGDIR}/packages/opensp/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
 ${PKGDIR}/packages/openssl/*.bb \
 ${PKGDIR}/packages/openvpn/*.bb \
@@ -167,6 +177,7 @@ ${PKGDIR}/packages/sane-backends/*.bb \
 ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
+${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index e9f88311c2..a633b56190 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -9,9 +9,10 @@ DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "3.0-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
+SLUGOS_IMAGENAME = "openslug"
 
-# nslu2-jffs2-image builds a complete image (not just the parts)
-INHERIT += "nslu2-jffs2-image"
+# openslug builds a complete image (not just the parts)
+SLUGOS_FLASH_IMAGE = "yes"
 
 # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see ucslugc-packages.conf in this
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index e65dff8946..e535f4e12a 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -25,14 +25,14 @@ PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.105"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
-PREFERRED_VERSION_libgpevtype ?= "0.12"
+PREFERRED_VERSION_libgpevtype ?= "0.14"
 PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_gpe-icons ?= "0.25"
 PREFERRED_VERSION_libgsm ?= "1.0.10"
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_xproto ?= "6.6.2"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
@@ -44,16 +44,16 @@ PREFERRED_VERSION_gpe-login ?= "0.83"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
-PREFERRED_VERSION_gpe-calendar ?= "0.65"
+PREFERRED_VERSION_gpe-calendar ?= "0.66"
 PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 PREFERRED_VERSION_gpe-contacts ?= "0.42"
 PREFERRED_VERSION_gpe-today ?= "0.10"
 PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 PREFERRED_VERSION_gpe-beam ?= "0.2.8" 
-PREFERRED_VERSION_gpe-bluetooth ?= "0.46"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.47"
 PREFERRED_VERSION_gpe-su ?= "0.19"
-PREFERRED_VERSION_gpe-conf ?= "0.1.25"
+PREFERRED_VERSION_gpe-conf ?= "0.1.26"
 PREFERRED_VERSION_gpe-clock ?= "0.21"
 PREFERRED_VERSION_gpe-mininet ?= "0.5"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
@@ -91,4 +91,4 @@ PREFERRED_VERSION_firefox ?= "1.0"
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 PREFERRED_VERSION_poppler ?= "0.3.3"
 PREFERRED_VERSION_evince ?= "0.3.2"
-PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
+PREFERRED_VERSION_gpe_mini_browser ?= "0.17"
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index ff608f28f2..d9f65b3831 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -68,6 +68,7 @@ PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
@@ -83,6 +84,7 @@ PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 828e0b5800..ff4be92a8c 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -67,6 +67,13 @@ INHERIT += "package_ipk debian"
 #FIXME: remove openslug
 DISTRO_BASE = ":slugos:openslug"
 
+# packages/meta/slugos-image.bb generates a binary image of the root file system
+# with a name controlled by the following setting - it defaults to the top level
+# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g.
+# if you change the DISTRO from one of the standard ones in a way which does not
+# change the generated image).
+SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
+
 # pull in the frozen list of bbfiles - this sets BBFILES and this will override any
 # setting in local.conf  Since this depends on ${DISTRO} it doesn't actually do
 # anything by default unless conf/distro/${DISTRO}-packages.conf exists.
@@ -99,45 +106,24 @@ include conf/distro/freeze.conf
 #----------------------------------------------------------------------------------
 # IMAGE BUILD OPTIONS
 # -------------------
-#FIXME: this is historical, there should be a minimal slugos device table and
-# this stuff shouldn't be in here at all (put it in slugos-image.bb!)
-# Why have anything in the config file to control the image build - why not
-# just select a different image .bb file (e.g. slugos-ramdisk-image.bb) to
-# build with different options.
-IMAGE_FSTYPES = "jffs2"
-IMAGE_SEX = "${@['big-endian', 'little-endian'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
-OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}"
-EXTRA_IMAGECMD_jffs2 = "--pad --${IMAGE_SEX} --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
-
 # CMDLINE* macros define the kernel command line.  CMDLINE_DEBUG is provided
 # to enable/disable debugging in the distro.  Here noirqdebug is used to
 # remove the messages about unhandled interrupts - people debugging interrupt
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
-# IMAGE_PREPROCESS_COMMAND is run before making the image.  In SlugOS the
-# kernel image is removed from the root file system to recover the space used -
-# SlugOS is assumed to boot from a separate kernel image in flash (not in the
-# root file system), if this is not the case the following must not be done!
-IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
-
-# Building a full image.  If you add the following extra commands will be
-# appended to the openslug-image build by classes/nslu2-jffs2-image.bbclass
-# (note that you can, instead, simply add 'inherit nslu2-jffs2-image' to
-# openslug-image.bb).  If you do this you will need to find a source for the
-# LinkSys software to be placed in the full image - 'RedBoot' (the boot loader),
-# 'Trailer' (just a bunch of bytes to flag the image as valid) and 'SysConf'
-# (actually just a block of unset data - you could modify this to pre-configure
-# the SysConf partition of the image).  If you own an NSLU2 then this data is
-# already in the flash of the NSLU2 and you can download it (including new
-# versions) from the LinkSys web site - the bbclass will output information
-# about where to put the downloaded data.
+# Building a full image.  If you set SLUGOS_FLASH_IMAGE to "yes" a complete
+# 8MByte flash image will be built after the rootfs JFFS2 image.
 #
-#NOTE: you do not actually need the boot loader in normal use because it is
-# *not* overwritten by a standard upslug upgrade, so you can make an image with
-# just non-LinkSys software which can be flashed into the NSLU2.
-#FIXME: this should not be here, only slugos-image.bb needs this
-#INHERIT += "nslu2-jffs2-image"
+# If you do this you will need to find a source for the LinkSys software to be
+# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch
+# of bytes to flag the image as valid) and 'SysConf' (actually just a block of
+# unset data - you could modify this to pre-configure the SysConf partition of the
+# image).  If you own an NSLU2 then this data is already in the flash of the NSLU2
+# and you can download it (including new versions) from the LinkSys web site - see
+# packages/meta/slugos-image.bb for information about where to put the downloaded
+# data.
+SLUGOS_FLASH_IMAGE ?= "no"
 
 # EXTRA PACKAGES
 # --------------
@@ -156,11 +142,6 @@ SLUGOS_EXTRA_DEPENDS ?= ""
 # Override this as desired - it makes no difference to the final image.
 SLUGOS_NATIVE_DEPENDS ?= "upslug2-native"
 
-#FIXME: this is for openslug-image, slugos-image should be called slugos!
-#FIXME: I find these names confusing, lets just use RDEPENDS and DEPENDS.
-OPENSLUG_EXTRA_INSTALL = "${SLUGOS_EXTRA_RDEPENDS}"
-OPENSLUG_EXTRA_DEPENDS = "${SLUGOS_EXTRA_DEPENDS} ${SLUGOS_NATIVE_DEPENDS}"
-
 #----------------------------------------------------------------------------------
 # PACKAGE VERSION CONTROL
 #----------------------------------------------------------------------------------
@@ -183,14 +164,20 @@ 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 ?= "nslu2-kernel"
-PREFERRED_VERSION_nslu2-kernel ?= "2.6.14"
+PREFERRED_VERSION_nslu2-kernel ?= "2.6.14.3"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
-PREFERRED_VERSION_ixp4xx-csr ?= "2.0"
-PREFERRED_VERSION_ixp-osal ?= "2.0"
-PREFERRED_VERSION_ixp400-eth ?= "1.4"
+PREFERRED_VERSION_ixp4xx-csr ?= "2.1"
+PREFERRED_VERSION_ixp-osal ?= "2.1"
+PREFERRED_VERSION_ixp400-eth ?= "1.5"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_x11 ?= "diet-x11"
 CVSDATE_diet-x11 ?= "20051005"
+
+# Ensure consistency across all SlugOS builds for the provider of a
+# relational database - use the latest version of the SleepyCat
+# Berkeley database
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 819bc8f984..8aec056d24 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -13,17 +13,21 @@ ${PKGDIR}/packages/bind/*.bb \
 ${PKGDIR}/packages/binutils/*.bb \
 ${PKGDIR}/packages/bison/*.bb \
 ${PKGDIR}/packages/bluez/*.bb \
+${PKGDIR}/packages/bogofilter/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
 ${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
 ${PKGDIR}/packages/ccxstream/*.bb \
+${PKGDIR}/packages/cherokee/*.bb \
 ${PKGDIR}/packages/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.bb \
 ${PKGDIR}/packages/ctorrent/*.bb \
 ${PKGDIR}/packages/cvs/*.bb \
+${PKGDIR}/packages/cyrus-imapd/*.bb \
+${PKGDIR}/packages/cyrus-sasl/*.bb \
 ${PKGDIR}/packages/db/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
@@ -32,6 +36,7 @@ ${PKGDIR}/packages/dnsmasq/*.bb \
 ${PKGDIR}/packages/dropbear/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
 ${PKGDIR}/packages/expat/*.bb \
+${PKGDIR}/packages/ez-ipupdate/*.bb \
 ${PKGDIR}/packages/fakeroot/*.bb \
 ${PKGDIR}/packages/file/*.bb \
 ${PKGDIR}/packages/findutils/*.bb \
@@ -97,11 +102,13 @@ ${PKGDIR}/packages/m4/*.bb \
 ${PKGDIR}/packages/mailx/*.bb \
 ${PKGDIR}/packages/make/*.bb \
 ${PKGDIR}/packages/makedevs/*.bb \
+${PKGDIR}/packages/masqmail/*.bb \
 ${PKGDIR}/packages/mdadm/*.bb \
 ${PKGDIR}/packages/meta/*.bb \
 ${PKGDIR}/packages/mgetty/*.bb \
 ${PKGDIR}/packages/miau/*.bb \
 ${PKGDIR}/packages/microcom/*.bb \
+${PKGDIR}/packages/minicom/*.bb \
 ${PKGDIR}/packages/module-init-tools/*.bb \
 ${PKGDIR}/packages/modutils/*.bb \
 ${PKGDIR}/packages/mt-daapd/*.bb \
@@ -182,5 +189,6 @@ ${PKGDIR}/packages/xdmcp/*.bb \
 ${PKGDIR}/packages/xextensions/*.bb \
 ${PKGDIR}/packages/xproto/*.bb \
 ${PKGDIR}/packages/xtrans/*.bb \
+${PKGDIR}/packages/zd1211/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
 ${UCSLUGC_EXTRA_BBFILES}"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 2de9010a90..359f8e657f 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -7,6 +7,7 @@ DISTRO_NAME = "UcSlugC"
 DISTRO_VERSION = "3-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
+SLUGOS_IMAGENAME = "ucslugc"
 
 # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see ucslugc-packages.conf in this
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 428f47f71e..9384b0527b 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -6,10 +6,11 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
 sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor"
+kernel-module-usbdcore kernel-module-usbdmonitor \
+altboot"
 
 # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
 
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 2445ee17a6..dab1d01e70 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index b9925852e5..626b5cf218 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -17,9 +17,9 @@ ROOT_FLASH_SIZE = "80"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
-PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
+PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
-		  nls_cp437 nls_utf8"
+		  nls_cp437 nls_iso8859-1 nls_utf8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -27,15 +27,15 @@ include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed" 
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim" 
+GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
+                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
@@ -45,9 +45,9 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_hx4700_ts = "hx4700_ts"
 module_autoload_hx4700_navpt = "hx4700_navpt"
 module_autoload_hx4700_bt = "hx4700_bt"
-module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
+module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pcm-oss = "snd-mixer-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
 
 #FIXME: this should be controlled by a userspace utility later.
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
new file mode 100644
index 0000000000..aa37f0920d
--- /dev/null
+++ b/conf/machine/nas100d.conf
@@ -0,0 +1,149 @@
+#@TYPE: Machine
+#@NAME: Iomega NAS 100d
+#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
+
+#-------------------------------------------------------------------------------
+# INPUTS
+#-------------------------------------------------------------------------------
+# conf/${DISTRO}.conf is included after this file and should be used to modify
+# variables identified as 'INPUTS' to the required values for the DISTRO, this
+# will cause the board specific settings (which depend for the most part on the
+# exact CPU used) to be set correctly within this file.  The results are the
+# variables identifies here as 'OUTPUTS'
+#
+#variable = "default"
+# <possible values>
+#    description
+
+ARCH_BYTE_SEX = "be"
+# "be" "le"
+#    The memory byte sex and (on correctly implemented hardware - the NAS100D is
+#    correct) the byte sex of the buses within the system.  'be' (big-endian)
+#    means that the first byte is the most significant byte on a bus, 'le'
+#    (little-endian) means that the first byte is the least significant byte.
+
+ARM_INSTRUCTION_SET = "arm"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+DISTRO_BASE = ""
+# "" ":<base>"
+#    If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
+#    after ${DISTRO}, this allows different distros to share a common base of
+#    overrides.  The value given must include a leading ':' or chaos will result.
+
+#-------------------------------------------------------------------------------
+# OUTPUTS
+#-------------------------------------------------------------------------------
+
+#OVERRIDES
+#    The standard ':' separated list of overrides used by bitbake - see the
+#    basic setting in bitbake.conf.  This list is based on that used for the
+#    standard setting however :<base>, :thumb and :thumb-interwork will be
+#    inserted at appropriate points if a base distro, default use of thumb or
+#    arm/thumb interworking are enabled in the inputs.
+OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+OVERRIDES = "local:${MACHINE}:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
+
+# TARGET_CC_ARCH
+# TARGET_CC_KERNEL_ARCH
+# TARGET_LD_ARCH
+# TARGET_LD_KERNEL_ARCH
+#    Compiler and linker options for application code and kernel code.  These
+#    options ensure that the compiler has the correct settings for the selected
+#    instruction set and interworking.
+ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+#
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
+TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb"
+TARGET_LD_ARCH = ""
+TARGET_LD_KERNEL_ARCH = ""
+
+# FULL_OPTIMIZATION
+#    Optimization settings.  Os works fine and is significantly better than O2.
+#    The other settings are somewhat arbitrary.  The optimisations chosen here
+#    include the ones which 'break' symbolic debugging (because the compiler does
+#    not include enough information to allow the debugger to know where given
+#    values are.)  The -fno options are an attempt to cancel explicit use of space
+#    consuming options found in some packages (this isn't a complete list, this is
+#    just the ones which package writers seem to know about and abuse).
+FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
+	-fno-unroll-loops -fno-inline-functions \
+	-fweb -funit-at-a-time"
+
+# TARGET_ARCH
+#    The correct setting for the system endianness (ARCH_BYTE_SEX).  This will
+#    be arm (le) or armeb (be) - it is difficult to be more precise in the
+#    setting because of the large number of ways it is used within OpenEmbedded.
+TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
+
+# PACKAGE_ARCH
+#    The correct setting for the generated packages.  This corresponds to the
+#    -march flag passed to the compiler because that limits the architectures
+#    on which the generated code will run.
+BYTE_SEX_CHAR = "${@['b', 'l'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
+PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+PACKAGE_ARCH = "${PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
+
+# IPKG_ARCHS
+#    The full list of package architectures which should run on the system.
+#    This takes into account both the board level issues and the INPUTS set
+#    by the distro.  The arm list is derived from the architecture settings
+#    known to gcc, the thumb list is then derived from that (only the 't'
+#    architectures of course).
+ARM_ARCHITECTURES = "${TARGET_ARCH} armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
+THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t${BYTE_SEX_CHAR}"
+
+#    NOTE: this list contains just the things which rootfs_ipk.bbclass does
+#    not add, rootfs_ipk.bbclass evaluates:
+#
+#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+#
+#    This is a priority ordered list - most desireable architecture at the end,
+#    so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
+#    THUMB_INTERWORK precede this with the other architectures.
+IPKG_ARCHS = "${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
+		(interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
+		+ (is_arm and arch_arm or arch_thumb)) \
+	       (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \
+		bb.data.getVar('ARM_ARCHITECTURES', d, 1), \
+		bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \
+		bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')}"
+
+#-------------------------------------------------------------------------------
+# Miscellany
+#-------------------------------------------------------------------------------
+# The correct settings for the NAS100D board:
+SERIAL_CONSOLE = "115200 ttyS0"
+KERNEL_CONSOLE = "ttyS0,115200n8"
+USE_VT = "0"
+
+#-------------------------------------------------------------------------------
+# Package versions
+#-------------------------------------------------------------------------------
+CVSDATE_gnu-config ?= "20050713"
+CVSDATE_gnu-config-native ?= "20050713"
+CVSDATE_ipkg-utils ?= "20050713"
+CVSDATE_ipkg-utils-native ?= "20050713"
+CVSDATE_ipkg-link ?= "20050713"
+CVSDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.152"
+PREFERRED_VERSION_ipkg-native ?= "0.99.152"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index d0f089be2a..be85a82048 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -44,6 +44,12 @@ DISTRO_BASE = ""
 #    after ${DISTRO}, this allows different distros to share a common base of
 #    overrides.  The value given must include a leading ':' or chaos will result.
 
+N2K_SUFFIX = "nslu2${ARCH_BYTE_SEX}"
+# <string>
+#    Kernel suffix - 'nslu2be' or 'nslu2le' for a truely generic image, controls
+#    the suffix on the name of the generated zImage, override in the DISTRO
+#    configuration if patches or defconfig are changed for the DISTRO.
+
 #-------------------------------------------------------------------------------
 # OUTPUTS
 #-------------------------------------------------------------------------------
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 02cabf20f7..56cc2c0852 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -43,8 +43,8 @@ USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
 ROOT_FLASH_SIZE = "24"
 USE_VT = "0"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop"
+GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop"
 
 include conf/machine/handheld-common.conf
 include conf/machine/tune-strongarm.conf
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 79ce0c4193..9a53e8f1a9 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -13,7 +13,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
 BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf
index d21c6097fa..5455e3f0d5 100644
--- a/conf/machine/tosa-2.6.conf
+++ b/conf/machine/tosa-2.6.conf
@@ -6,9 +6,9 @@ module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
 module_autoload_snd-pcm-oss ="snd-pcm-oss"
 
 # WM97xx Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
-#module_autoload_wm9705 = "wm9705"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
+module_autoload_wm9705 = "wm9705"
 #module_autoload_pxa-wm97xx = "pen_int=0"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
-module_autoload_wm97xx = "wm97xx"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
+#module_autoload_wm97xx = "wm97xx"
diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf
index 563586c902..5e2f6b7c62 100644
--- a/conf/machine/tune-arm926ejs.conf
+++ b/conf/machine/tune-arm926ejs.conf
@@ -1,2 +1,3 @@
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+#if gcc breaks change arm926ejs to arm926ej-s
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 PACKAGE_ARCH = "armv5te"