merge of 8893b7644179a244e95e78cea49c28cecbedc8b2

     and 9ef371d5ab888cd926919c7bf505d283e4f19f54

11 files changed, 361 insertions, 30 deletions

diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
new file mode 100644
index 0000000000..f946afe216
--- /dev/null
+++ b/conf/distro/openslug-native.conf
@@ -0,0 +1,17 @@
+include conf/distro/openslug.conf
+
+# Corresponting packages should be in openslug-native.bb,
+# currently missing: ipkg-utils libtool quilt pkgconfig
+ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \
+		   quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \
+		   virtual/armeb-linux-gcc virtual/libc update-rc.d"
+
+# Our build host is armeb, not armv5eb that the kernel reports
+BUILD_ARCH = armeb
+
+# I don't know of any packages we currently need to compile nativly, so here are two examples
+BBFILES = "\
+${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/gzip/*.bb \
+${OPENSLUG_EXTRA_BBFILES}"
+				      
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index e4da231aa5..8719894e6a 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -15,11 +15,15 @@ ${PKGDIR}/packages/bluez-utils/*.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/coreutils/*.bb \
 ${PKGDIR}/packages/cpio/*.bb \
 ${PKGDIR}/packages/cron/*.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/diffutils/*.bb \
@@ -92,6 +96,7 @@ ${PKGDIR}/packages/musicpd/*.bb \
 ${PKGDIR}/packages/mutt/*.bb \
 ${PKGDIR}/packages/mysql/*.bb \
 ${PKGDIR}/packages/nail/*.bb \
+${PKGDIR}/packages/nano/*.bb \
 ${PKGDIR}/packages/ncftp/*.bb \
 ${PKGDIR}/packages/ncurses/*.bb \
 ${PKGDIR}/packages/netbase/*.bb \
@@ -137,13 +142,16 @@ ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
 ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/tar/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
+${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
+${PKGDIR}/packages/udev/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
 ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
@@ -154,4 +162,4 @@ ${PKGDIR}/packages/vlan/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
-"
+${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index dd4d7c0b5b..80cf489b5b 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,13 +2,36 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
+#----------------------------------------------------------------------------------
+# STANDARD OpenSlug DEFINITIONS
+#----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "2.4-beta"
 DISTRO_TYPE ?= "beta"
 
-# pull in the frozen list of bbfiles
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+INHERIT += " package_ipk debian nslu2_flashimg"
+
+# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
+# the .bb files for the packages to build - see openslug-packages.conf in this
+# directory
+OPENSLUG_EXTRA_BBFILES ?= ""
+
+# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
+# setting in local.conf
 include conf/distro/freeze.conf
 
+#----------------------------------------------------------------------------------
+# FEEDS
+#  The following lines define where on the internet OpenSlug looks for packages
+#  when downloading new packages or updating existing packages.  Additional feeds
+#  (such as a local feed) can be defined in local.conf
+#----------------------------------------------------------------------------------
 # Add to the user's feeds from local.conf (there may be none)
 FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
 FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
@@ -18,30 +41,24 @@ FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/na
 #FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
 #FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
 
-
-TARGET_FPU_local ?= "soft"
-TARGET_FPU := "${TARGET_FPU_local}"
-TARGET_OS_local ?= "linux"
-TARGET_OS := "${TARGET_OS_local}"
-
-USE_NLS ?= "no"
-USE_NLS_glib-2.0 = "yes"
-
-INHERIT += " package_ipk debian nslu2_flashimg"
-
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# IMAGE BUILD OPTIONS
+# -------------------
 IMAGE_FSTYPES = "jffs2"
 
 OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}"
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
 
-OPENSLUG_EXTRA_DEPENDS  ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
-
 # 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"
 
+# EXTRA PACKAGES
+# --------------
 # Filesystem support modules are listed in here for easy removal,
 # as is the lrzsz serial package and other kernel modules which are
 # not absolutely required for boot.
@@ -49,13 +66,47 @@ CMDLINE_DEBUG = "noirqdebug"
 # the ext2/ext3 support is optional!
 OPENSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck"
 OPENSLUG_REISER_PROGS = "reiserfsprogs"
-OPENSLUG_EXTRA_RDEPENDS ?= "\
-lrzsz \
-${OPENSLUG_EXT2_PROGS} ${OPENSLUG_REISER_PROGS} \
-kernel-module-usbnet \
-kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \
-kernel-module-usbserial \
-kernel-module-pl2303 kernel-module-ftdi-sio"
+
+# The standard firmware contents and additional packages built as requirements
+# of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and
+# OPENSLUG_STANDARD_DEPENDS respectively.
+OPENSLUG_STANDARD_DEPENDS = ""
+OPENSLUG_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the openslug
+# image, programs to format disks with these file systems may be
+# added or removed.  By default ext2. ext3 and reiserfs supported
+# is included by the following lines.
+# 
+# These lines add support for formatting ext2 and ext3 file systems
+# on a hard disk attached to the NSLU2.  ext3 is the standard Linux
+# file system.
+OPENSLUG_STANDARD_DEPENDS += "e2fsprogs"
+OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
+
+# These lines add support for formatting reiserfs file systems on
+# a hard disk.
+OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs"
+OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
+
+# These lines add a build of the 'upslug' program which may be
+# used to download the final image to an NSLU2.  The program can
+# be found within the tmp/work/upslug-native* directory.
+OPENSLUG_STANDARD_DEPENDS += "upslug-native"
+
+# These lines add support for an X/Y/ZModem package called lrzsz
+# (this is of use for people with modified NSLU2 hardware which
+# supports a serial port.)
+OPENSLUG_STANDARD_DEPENDS += "lrzsz"
+OPENSLUG_STANDARD_RDEPENDS += "lrzsz"
+
+# The 'standard' values are the defaults for the 'extra' packages added
+# to the firmware image.  None of these things are requirements to have
+# a bootable, useable, system however they *are* expected to be present
+# in OpenSlug - see osuclibc for a more minimal configuration and some
+# more instructions about how to make a non-openslug image.
+OPENSLUG_EXTRA_DEPENDS  ?= "${OPENSLUG_STANDARD_DEPENDS}"
+OPENSLUG_EXTRA_RDEPENDS ?= "${OPENSLUG_STANDARD_RDEPENDS}"
 
 # Filesystem selection: set in local.conf to override.  Adding entries
 # here adds the module to the image.  The module must be built as part
@@ -68,6 +119,8 @@ kernel-module-pl2303 kernel-module-ftdi-sio"
 # for more information on the language behaviour of the DOS file
 # systems.
 #
+# KERNEL LEVEL FILE SYSTEM SUPPORT
+# --------------------------------
 # NOTE: removing kernel-module-nfs from this list will prevent NFS
 # boot (however you can do a simple flash file system boot - no
 # attached disk - and install the nfs modules from ssh.)
@@ -94,6 +147,9 @@ kernel-module-nls-utf8 \
 
 OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
 
+#----------------------------------------------------------------------------------
+# PACKAGE VERSION CONTROL
+#----------------------------------------------------------------------------------
 # Select the correct versions of the compiler tools (note that there
 # is also some selection in machine/nslu2.conf)
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -103,9 +159,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
-# Tracking the latest version, so the following is commented out.
-# Uncomment it before release!
 PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
new file mode 100644
index 0000000000..b76d352b8a
--- /dev/null
+++ b/conf/distro/ucslugc-packages.conf
@@ -0,0 +1,142 @@
+# automatically generated by bitbake freeze
+# hacked by the addition of UCSLUG_EXTRA_BBFILES at the end
+BBFILES := "\
+${PKGDIR}/packages/atftp/*.bb \
+${PKGDIR}/packages/autoconf/*.bb \
+${PKGDIR}/packages/automake/*.bb \
+${PKGDIR}/packages/base-files/*.bb \
+${PKGDIR}/packages/base-passwd/*.bb \
+${PKGDIR}/packages/bash/*.bb \
+${PKGDIR}/packages/binutils/*.bb \
+${PKGDIR}/packages/bison/*.bb \
+${PKGDIR}/packages/bluez-libs/*.bb \
+${PKGDIR}/packages/bluez-utils/*.bb \
+${PKGDIR}/packages/boost/*.bb \
+${PKGDIR}/packages/bridge-utils/*.bb \
+${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/coreutils/*.bb \
+${PKGDIR}/packages/cpio/*.bb \
+${PKGDIR}/packages/cron/*.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/diffutils/*.bb \
+${PKGDIR}/packages/dnsmasq/*.bb \
+${PKGDIR}/packages/dropbear/*.bb \
+${PKGDIR}/packages/expat/*.bb \
+${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/findutils/*.bb \
+${PKGDIR}/packages/flex/*.bb \
+${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/ftpd-topfield/*.bb \
+${PKGDIR}/packages/gawk/*.bb \
+${PKGDIR}/packages/gcc/*.bb \
+${PKGDIR}/packages/gdb/*.bb \
+${PKGDIR}/packages/gdbm/*.bb \
+${PKGDIR}/packages/gettext/*.bb \
+${PKGDIR}/packages/glib-2.0/*.bb \
+${PKGDIR}/packages/gnu-config/*.bb \
+${PKGDIR}/packages/gphoto2/*.bb \
+${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/gtk-doc/*.bb \
+${PKGDIR}/packages/gzip/*.bb \
+${PKGDIR}/packages/hotplug-ng/*.bb \
+${PKGDIR}/packages/initscripts/*.bb \
+${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
+${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/ircp/*.bb \
+${PKGDIR}/packages/ixp425-eth/*.bb \
+${PKGDIR}/packages/ixp4xx/*.bb \
+${PKGDIR}/packages/jpeg/*.bb \
+${PKGDIR}/packages/less/*.bb \
+${PKGDIR}/packages/libaal/*.bb \
+${PKGDIR}/packages/libexif/*.bb \
+${PKGDIR}/packages/libgphoto2/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
+${PKGDIR}/packages/libid3tag/*.bb \
+${PKGDIR}/packages/libogg/*.bb \
+${PKGDIR}/packages/libpcap/*.bb \
+${PKGDIR}/packages/libtool/*.bb \
+${PKGDIR}/packages/libusb/*.bb \
+${PKGDIR}/packages/libvorbis/*.bb \
+${PKGDIR}/packages/libxml/*.bb \
+${PKGDIR}/packages/linux-libc-headers/*.bb \
+${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/lsof/*.bb \
+${PKGDIR}/packages/lzo/*.bb \
+${PKGDIR}/packages/m4/*.bb \
+${PKGDIR}/packages/make/*.bb \
+${PKGDIR}/packages/makedevs/*.bb \
+${PKGDIR}/packages/man-pages/*.bb \
+${PKGDIR}/packages/man/*.bb \
+${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/miau/*.bb \
+${PKGDIR}/packages/microcom/*.bb \
+${PKGDIR}/packages/module-init-tools/*.bb \
+${PKGDIR}/packages/modutils/*.bb \
+${PKGDIR}/packages/monotone/*.bb \
+${PKGDIR}/packages/mt-daapd/*.bb \
+${PKGDIR}/packages/mtd/*.bb \
+${PKGDIR}/packages/mutt/*.bb \
+${PKGDIR}/packages/mysql/*.bb \
+${PKGDIR}/packages/nail/*.bb \
+${PKGDIR}/packages/nano/*.bb \
+${PKGDIR}/packages/ncftp/*.bb \
+${PKGDIR}/packages/ncurses/*.bb \
+${PKGDIR}/packages/netbase/*.bb \
+${PKGDIR}/packages/nslu2-binary-only/*.bb \
+${PKGDIR}/packages/ntp/*.bb \
+${PKGDIR}/packages/obexftp/*.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/openssh/*.bb \
+${PKGDIR}/packages/openssl/*.bb \
+${PKGDIR}/packages/openvpn/*.bb \
+${PKGDIR}/packages/patch/*.bb \
+${PKGDIR}/packages/patcher/*.bb \
+${PKGDIR}/packages/pciutils/*.bb \
+${PKGDIR}/packages/pcmcia-cs/*.bb \
+${PKGDIR}/packages/pcre/*.bb \
+${PKGDIR}/packages/pkgconfig/*.bb \
+${PKGDIR}/packages/popt/*.bb \
+${PKGDIR}/packages/portmap/*.bb \
+${PKGDIR}/packages/ppp/*.bb \
+${PKGDIR}/packages/procps/*.bb \
+${PKGDIR}/packages/psmisc/*.bb \
+${PKGDIR}/packages/puppy/*.bb \
+${PKGDIR}/packages/pwc/*.bb \
+${PKGDIR}/packages/python/*.bb \
+${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/readline/*.bb \
+${PKGDIR}/packages/reiser4progs/*.bb \
+${PKGDIR}/packages/reiserfsprogs/*.bb \
+${PKGDIR}/packages/rsync/*.bb \
+${PKGDIR}/packages/samba/*.bb \
+${PKGDIR}/packages/sane-backends/*.bb \
+${PKGDIR}/packages/screen/*.bb \
+${PKGDIR}/packages/sed/*.bb \
+${PKGDIR}/packages/setpwc/*.bb \
+${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/strace/*.bb \
+${PKGDIR}/packages/sudo/*.bb \
+${PKGDIR}/packages/sysfsutils/*.bb \
+${PKGDIR}/packages/sysvinit/*.bb \
+${PKGDIR}/packages/thttpd/*.bb \
+${PKGDIR}/packages/tinylogin/*.bb \
+${PKGDIR}/packages/uclibc/*.bb \
+${PKGDIR}/packages/unionfs/*.bb \
+${PKGDIR}/packages/unzip/*.bb \
+${PKGDIR}/packages/update-modules/*.bb \
+${PKGDIR}/packages/update-rc.d/*.bb \
+${PKGDIR}/packages/util-linux/*.bb \
+${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/wget/*.bb \
+${PKGDIR}/packages/zlib/*.bb \
+${OPENSLUG_UCSLUGC_BBFILES}"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
new file mode 100644
index 0000000000..34bc39a3a3
--- /dev/null
+++ b/conf/distro/ucslugc.conf
@@ -0,0 +1,95 @@
+#@TYPE: Distribution
+#@NAME: UcSlugC
+#@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2
+
+#----------------------------------------------------------------------------------
+# STANDARD UcSlugC DEFINITIONS
+#----------------------------------------------------------------------------------
+DISTRO_NAME = "UcSlugC"
+DISTRO_VERSION = "1-beta"
+DISTRO_TYPE ?= "beta"
+
+TARGET_FPU = "soft"
+TARGET_OS = "linux-uclibc"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+INHERIT += " package_ipk debian nslu2_flashimg"
+
+# The OVERRIDES are modified here so that 'openslug' overrides are picked up if
+# present (ucslugc overrides take precedence)
+OVERRIDES = "local:${MACHINE}:${DISTRO}:openslug:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+
+# 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
+# directory
+OPENSLUG_UCSLUGC_BBFILES ?= ""
+
+# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
+# setting in local.conf
+include conf/distro/freeze.conf
+
+#----------------------------------------------------------------------------------
+# FEEDS
+#  The following lines define where on the internet UcSlugC looks for packages
+#  when downloading new packages or updating existing packages.  Additional feeds
+#  (such as a local feed) can be defined in local.conf
+#----------------------------------------------------------------------------------
+# Add to the user's feeds from local.conf (there may be none)
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}"
+
+#
+# Uncomment the following to get the unstable feeds
+#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable"
+#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable"
+
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# IMAGE BUILD OPTIONS
+# -------------------
+IMAGE_FSTYPES = "jffs2"
+
+OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}"
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --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"
+
+# EXTRA PACKAGES
+# --------------
+# UcSlugC builds an openslug-image with no extra packages - to add packages to the
+# firmware copy this file (to make a new 'distro' configuration file) and change
+# the definition below to include the requirements.
+# NOTE: as built this system will *not* be able to boot off anything other than
+# the flash file system ('turnup' will not work).  You need to add the filesystem
+# modules for your chosen root file system (and any others which will be used).
+# See openslug.conf for a more full-featured system!
+UCLIBC_EXTRA_RDEPENDS ?= ""
+UCLIBC_EXTRA_DEPENDS ?= ""
+#UCLIBC_EXTRA_BBFILES above may also need to be set
+
+OPENSLUG_EXTRA_INSTALL = "${UCLIBC_EXTRA_RDEPENDS}"
+OPENSLUG_EXTRA_DEPENDS = "${UCLIBC_EXTRA_DEPENDS}"
+
+#----------------------------------------------------------------------------------
+# PACKAGE VERSION CONTROL
+#----------------------------------------------------------------------------------
+# Select the correct versions of the compiler tools (note that there
+# is also some selection in machine/nslu2.conf)
+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"
+
+# Select the correct versions of the kernel and modules
+PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
+
+PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
+PREFERRED_VERSION_ixp425-eth ?= "1.1"
diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf
index 8e556db009..1f41b1e846 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/unslung-packages.conf
@@ -34,4 +34,4 @@ ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
-"
+${UNSLUNG_EXTRA_BBFILES}"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index e250b64c41..75c251f220 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -11,6 +11,7 @@ DISTRO_VERSION = "5.5-beta"
 DISTRO_TYPE = "beta"
 
 # pull in the frozen list of bbfiles
+UNSLUNG_EXTRA_BBFILES ?= ""
 include conf/distro/freeze.conf
 
 TARGET_FPU = "soft"
@@ -33,6 +34,11 @@ kernel-module-pl2303 kernel-module-ftdi-sio"
 
 UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
 
+# Select between multiple alternative providers, if more than one is eligible.
+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"
+
 PREFERRED_VERSION_glibc ?= "2.2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.2.5"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
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"
 
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
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 2ce73ac836..3beac45143 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -35,3 +35,6 @@ 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/"
+INHERIT += "nslu2-mirrors"
diff --git a/conf/tinder.conf b/conf/tinder.conf
index 3d65dcb51b..2c50b62a17 100644
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@ -12,7 +12,7 @@ INHERIT          += "tinderclient"
 
 #One mail/post per task
 #TINDER_VERBOSE_REPORT = "1"
-#TINDER_LOG        = "${TMPDIR}/tinder.log"
+#TINDER_LOG        = "${TMPbDIR}/tinder.log"
 #TINDER_TREE       = "OpenEmbeddedBuild"
 
 
@@ -30,6 +30,9 @@ INHERIT          += "tinderclient"
 #TINDER_SENDLOG    = "http"
 
 
+# TimeZone handling
+#TINDER_TZ         = "+0200"
+
 # Do a report at all
 #TINDER_REPORT     = "1"