21 files changed, 153 insertions, 800 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 2a33ad4164..59123fd6b5 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -2,131 +2,10 @@
 #@NAME: DebianSlug
 #@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
 
-#----------------------------------------------------------------------------------
-# STANDARD DebianSlug DEFINITIONS
-#----------------------------------------------------------------------------------
 DISTRO_NAME = "DebianSlug"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "debianslug"
-SLUGOS_IMAGESEX  = "little-endian"
+IMAGE_BASENAME = "debianslug"
+TARGET_ARCH = "arm"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
 
-# debianslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "1"
-
-# NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to
-# the .bb files for the packages to build - see debianslug-packages.conf in this
-# directory
-DEBIANSLUG_EXTRA_BBFILES ?= ""
-
-#----------------------------------------------------------------------------------
-# FIRMWARE CONFIGURATION
-#----------------------------------------------------------------------------------
-# 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.
-# NOTE: only jffs2 support is an absolute requirement of boot, even
-# the ext2/ext3 support is optional!
-DEBIANSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
-
-# The standard firmware contents and additional packages built as requirements
-# of the firmware are defined here in DEBIANSLUG_STANDARD_RDEPENDS and
-# DEBIANSLUG_STANDARD_DEPENDS respectively.
-DEBIANSLUG_STANDARD_RDEPENDS = ""
-
-# Support for a variety of file systems is built in to the debianslug
-# image, programs to format disks with these file systems may be
-# added or removed.  By default ext2 and ext3 support
-# 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.
-DEBIANSLUG_STANDARD_RDEPENDS += "${DEBIANSLUG_EXT2_PROGS}"
-
-# 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.)
-DEBIANSLUG_STANDARD_RDEPENDS += "lrzsz"
-
-# Filesystem selection.  Adding entries here adds the module to the
-# image.  The module must be built as part of nslu2-kernel (i.e. it
-# must be specified as a module in the defconfig file).  The NLS
-# support charset modules must be given explicitly and must match
-# the codepage/iocharset and NLS handling for the file systems which
-# require them.  The installed lanugage set is minimal but sufficient
-# for any file system (since it uses utf8).  See
-# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
-# 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.)
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ext2 \
-kernel-module-jbd \
-kernel-module-ext3 \
-kernel-module-vfat \
-kernel-module-ntfs \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-nls-cp437 \
-kernel-module-nls-utf8 \
-"
-
-# Add daemon required for HW RNG support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-rng-tools \
-"
-
-# Add modules required for usb support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ohci-hcd \
-kernel-module-uhci-hcd \
-"
-
-# Add modules required for IDE support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-libata \
-kernel-module-pata-artop \
-"
-
-# Add modules required for Network support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-via-velocity \
-"
-
-# This documents other file systems which are built but not installed
-# by default in the flash image.
-#
-# kernel-module-msdos - mounts a FAT file system without long file names
-#                       (use kernel-module-vfat, it shows the long names
-#                       if present.)
-
-# 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 DebianSlug - see slugos-lag for a more minimal configuration and some
-# more instructions about how to make a non-debianslug image.
-DEBIANSLUG_EXTRA_RDEPENDS ?= ""
-SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS} ${DEBIANSLUG_EXTRA_RDEPENDS}"
-
-#----------------------------------------------------------------------------------
-# PACKAGE VERSION CONTROL
-#----------------------------------------------------------------------------------
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-
-#----------------------------------------------------------------------------------
-# BASE VERSION SELECTION
-#----------------------------------------------------------------------------------
-# l - little-endian
-# a - ARM instruction set
-# g - glibc
-#
-require conf/distro/slugos-lag.conf
+require conf/distro/slugos.conf
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 79ec27af72..9efe1d5d90 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,10 +37,6 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
-
-#Make a LE jffs2 image
-SLUGOS_IMAGESEX = "little-endian"
-
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
@@ -50,4 +46,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
-DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci"
+DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc
deleted file mode 100644
index a4b9a6720f..0000000000
--- a/conf/distro/include/debianslug-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}"
-require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc
index d41cb89111..4c2c8b1e2e 100644
--- a/conf/distro/include/freeze.inc
+++ b/conf/distro/include/freeze.inc
@@ -14,12 +14,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security"
 
 # Pull in the frozen definitions (if they exist)  The multiple
 # includes allow the frozen file to be stored alongside local.conf
-# and in the conf/distro directory - the former take precedence over
-# the latter.
-require conf/distro/include/${DISTRO}-packages.inc
+# and in a distro-specific frozen directory - the former take
+# precedence over the latter.
 include conf/${DISTRO}-packages.conf
 include ${FROZEN_DIR}/${DISTRO}-packages.conf
 
-require conf/distro/include/${DISTRO}-bbfiles.inc
 include conf/${DISTRO}-bbfiles.conf
 include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf
diff --git a/conf/distro/include/openslug-native-packages.inc b/conf/distro/include/openslug-native-packages.inc
deleted file mode 100644
index 7f7a448434..0000000000
--- a/conf/distro/include/openslug-native-packages.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# automatically generated by bitbake freeze
-BBFILES := "\
-${PKGDIR}/packages/apache/*.bb \
-${PKGDIR}/packages/openssl/*.bb \
-${PKGDIR}/packages/ipkg-utils/*.bb \
-${PKGDIR}/packages/meta/package-index.bb \
-${PKGDIR}/packages/meta/openslug-native-packages.bb \
-${PKGDIR}/packages/freeze/*.bb \
-${PKGDIR}/packages/pcre/*.bb \
-${PKGDIR}/packages/expat/*.bb \
-${OPENSLUG_NATIVE_EXTRA_BBFILES}"
diff --git a/conf/distro/include/openslug-packages.inc b/conf/distro/include/openslug-packages.inc
deleted file mode 100644
index fe09a7bcfa..0000000000
--- a/conf/distro/include/openslug-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}"
-require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/slugos-packages.inc b/conf/distro/include/slugos-packages.inc
deleted file mode 100644
index 650368a990..0000000000
--- a/conf/distro/include/slugos-packages.inc
+++ /dev/null
@@ -1,259 +0,0 @@
-BBFILES := "\
-${PKGDIR}/packages/alsa/*.bb \
-${PKGDIR}/packages/apr/*.bb \
-${PKGDIR}/packages/asterisk/*.bb \
-${PKGDIR}/packages/asterisk-sounds/*.bb \
-${PKGDIR}/packages/atftp/*.bb \
-${PKGDIR}/packages/audiofile/*.bb \
-${PKGDIR}/packages/aumix/*.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/beep/*.bb \
-${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/btsco/*.bb \
-${PKGDIR}/packages/busybox/*.bb \
-${PKGDIR}/packages/bwmon/*.bb \
-${PKGDIR}/packages/bzip2/*.bb \
-${PKGDIR}/packages/ccxstream/*.bb \
-${PKGDIR}/packages/cdparanoia/*.bb \
-${PKGDIR}/packages/cdstatus/*.bb \
-${PKGDIR}/packages/cherokee/*.bb \
-${PKGDIR}/packages/coreutils/*.bb \
-${PKGDIR}/packages/cpio/*.bb \
-${PKGDIR}/packages/cron/*.bb \
-${PKGDIR}/packages/ctorrent/*.bb \
-${PKGDIR}/packages/ctrlproxy/*.bb \
-${PKGDIR}/packages/curl/*.bb \
-${PKGDIR}/packages/cvs/*.bb \
-${PKGDIR}/packages/cyrus-imapd/*.bb \
-${PKGDIR}/packages/cyrus-sasl/*.bb \
-${PKGDIR}/packages/davfs2/*.bb \
-${PKGDIR}/packages/db/*.bb \
-${PKGDIR}/packages/dbus/*.bb \
-${PKGDIR}/packages/devio/*.bb \
-${PKGDIR}/packages/device-mapper/*.bb \
-${PKGDIR}/packages/devlabel/*.bb \
-${PKGDIR}/packages/dhcp/*.bb \
-${PKGDIR}/packages/didiwiki/*.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/e2fsprogs-libs/*.bb \
-${PKGDIR}/packages/eciadsl/*.bb \
-${PKGDIR}/packages/expat/*.bb \
-${PKGDIR}/packages/ez-ipupdate/*.bb \
-${PKGDIR}/packages/fakeroot/*.bb \
-${PKGDIR}/packages/fetchmail/*.bb \
-${PKGDIR}/packages/file/*.bb \
-${PKGDIR}/packages/findutils/*.bb \
-${PKGDIR}/packages/flac/*.bb \
-${PKGDIR}/packages/flex/*.bb \
-${PKGDIR}/packages/freeze/*.bb \
-${PKGDIR}/packages/ftpd-topfield/*.bb \
-${PKGDIR}/packages/gawk/*.bb \
-${PKGDIR}/packages/gcc/*.bb \
-${PKGDIR}/packages/gd/*.bb \
-${PKGDIR}/packages/gdb/*.bb \
-${PKGDIR}/packages/gdbm/*.bb \
-${PKGDIR}/packages/gettext/*.bb \
-${PKGDIR}/packages/glib-1.2/*.bb \
-${PKGDIR}/packages/glib-2.0/*.bb \
-${PKGDIR}/packages/glibc/*.bb \
-${PKGDIR}/packages/gnu-config/*.bb \
-${PKGDIR}/packages/gnutls/*.bb \
-${PKGDIR}/packages/gphoto2/*.bb \
-${PKGDIR}/packages/gpsd/*.bb \
-${PKGDIR}/packages/grep/*.bb \
-${PKGDIR}/packages/groff/*.bb \
-${PKGDIR}/packages/gtk-doc/*.bb \
-${PKGDIR}/packages/gzip/*.bb \
-${PKGDIR}/packages/hal/*.bb \
-${PKGDIR}/packages/hotplug-ng/*.bb \
-${PKGDIR}/packages/icecast/*.bb \
-${PKGDIR}/packages/ifupdown/*.bb \
-${PKGDIR}/packages/initscripts/*.bb \
-${PKGDIR}/packages/install/*.bb \
-${PKGDIR}/packages/intltool/*.bb \
-${PKGDIR}/packages/iperf/*.bb \
-${PKGDIR}/packages/ipkg-utils/*.bb \
-${PKGDIR}/packages/ipkg/*.bb \
-${PKGDIR}/packages/iptables/*.bb \
-${PKGDIR}/packages/ircp/*.bb \
-${PKGDIR}/packages/irssi/*.bb \
-${PKGDIR}/packages/ixp425-eth/*.bb \
-${PKGDIR}/packages/ixp4xx/*.bb \
-${PKGDIR}/packages/joe/*.bb \
-${PKGDIR}/packages/jpeg/*.bb \
-${PKGDIR}/packages/lcdproc/*.bb \
-${PKGDIR}/packages/less/*.bb \
-${PKGDIR}/packages/libaal/*.bb \
-${PKGDIR}/packages/libao/*.bb \
-${PKGDIR}/packages/libdvb/*.bb \
-${PKGDIR}/packages/libexif/*.bb \
-${PKGDIR}/packages/libgcrypt/*.bb \
-${PKGDIR}/packages/libgpg-error/*.bb \
-${PKGDIR}/packages/libgphoto2/*.bb \
-${PKGDIR}/packages/libgsm/*.bb \
-${PKGDIR}/packages/libiconv/*.bb \
-${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 \
-${PKGDIR}/packages/libpng/*.bb \
-${PKGDIR}/packages/libtiff/*.bb \
-${PKGDIR}/packages/libtool/*.bb \
-${PKGDIR}/packages/libusb/*.bb \
-${PKGDIR}/packages/libvorbis/*.bb \
-${PKGDIR}/packages/libxml/*.bb \
-${PKGDIR}/packages/libxslt/* \
-${PKGDIR}/packages/linux-libc-headers/*.bb \
-${PKGDIR}/packages/linux/*.bb \
-${PKGDIR}/packages/lirc/*.bb \
-${PKGDIR}/packages/lrzsz/*.bb \
-${PKGDIR}/packages/lsof/*.bb \
-${PKGDIR}/packages/lvm2/*.bb \
-${PKGDIR}/packages/lzo/*.bb \
-${PKGDIR}/packages/m4/*.bb \
-${PKGDIR}/packages/madplay/*.bb \
-${PKGDIR}/packages/madwifi/*.bb \
-${PKGDIR}/packages/mailx/*.bb \
-${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/memtester/*.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/monotone/*.bb \
-${PKGDIR}/packages/motion/*.bb \
-${PKGDIR}/packages/mt-daapd/*.bb \
-${PKGDIR}/packages/mtd/*.bb \
-${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/neon/*.bb \
-${PKGDIR}/packages/netbase/*.bb \
-${PKGDIR}/packages/netcat/*.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/*.bb \
-${PKGDIR}/packages/opensp/*.bb \
-${PKGDIR}/packages/openssh/*.bb \
-${PKGDIR}/packages/openssl/*.bb \
-${PKGDIR}/packages/openvpn/*.bb \
-${PKGDIR}/packages/pam/*.bb \
-${PKGDIR}/packages/patch/*.bb \
-${PKGDIR}/packages/patcher/*.bb \
-${PKGDIR}/packages/patchutils/*.bb \
-${PKGDIR}/packages/pciutils/*.bb \
-${PKGDIR}/packages/pcmcia-cs/*.bb \
-${PKGDIR}/packages/pcre/*.bb \
-${PKGDIR}/packages/perl/*.bb \
-${PKGDIR}/packages/php/*.bb \
-${PKGDIR}/packages/pkgconfig/*.bb \
-${PKGDIR}/packages/popt/*.bb \
-${PKGDIR}/packages/portmap/*.bb \
-${PKGDIR}/packages/postfix/*.bb \
-${PKGDIR}/packages/ppp/*.bb \
-${PKGDIR}/packages/procps/*.bb \
-${PKGDIR}/packages/psmisc/*.bb \
-${PKGDIR}/packages/puppy/*.bb \
-${PKGDIR}/packages/pvrusb2-mci/*.bb \
-${PKGDIR}/packages/pwc/*.bb \
-${PKGDIR}/packages/python/*.bb \
-${PKGDIR}/packages/qc-usb/*.bb \
-${PKGDIR}/packages/quilt/*.bb \
-${PKGDIR}/packages/radlib/*.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/setserial/*.bb \
-${PKGDIR}/packages/sgml-common/*.bb \
-${PKGDIR}/packages/slugimage/*.bb \
-${PKGDIR}/packages/slugos-init/*.bb \
-${PKGDIR}/packages/spca5xx/*.bb \
-${PKGDIR}/packages/ssmtp/*.bb \
-${PKGDIR}/packages/strace/*.bb \
-${PKGDIR}/packages/streamripper/*.bb \
-${PKGDIR}/packages/subversion/*.bb \
-${PKGDIR}/packages/sudo/*.bb \
-${PKGDIR}/packages/sysfsutils/*.bb \
-${PKGDIR}/packages/syslog-ng/*.bb \
-${PKGDIR}/packages/sysvinit/*.bb \
-${PKGDIR}/packages/tar/*.bb \
-${PKGDIR}/packages/tcltk/*.bb \
-${PKGDIR}/packages/thttpd/*.bb \
-${PKGDIR}/packages/time/*.bb \
-${PKGDIR}/packages/timezones/*.bb \
-${PKGDIR}/packages/tinylogin/*.bb \
-${PKGDIR}/packages/uclibc/*.bb \
-${PKGDIR}/packages/udev/*.bb \
-${PKGDIR}/packages/unionfs/*.bb \
-${PKGDIR}/packages/unzip/*.bb \
-${PKGDIR}/packages/update-modules/*.bb \
-${PKGDIR}/packages/update-rc.d/*.bb \
-${PKGDIR}/packages/upslug/*.bb \
-${PKGDIR}/packages/usbutils/*.bb \
-${PKGDIR}/packages/util-linux/*.bb \
-${PKGDIR}/packages/vim/*.bb \
-${PKGDIR}/packages/vlan/*.bb \
-${PKGDIR}/packages/vpnc/*.bb \
-${PKGDIR}/packages/vsftpd/*.bb \
-${PKGDIR}/packages/w3cam/*.bb \
-${PKGDIR}/packages/wakelan/*.bb \
-${PKGDIR}/packages/wget/*.bb \
-${PKGDIR}/packages/whois/*.bb \
-${PKGDIR}/packages/wireless-tools/*.bb \
-${PKGDIR}/packages/wpa-supplicant/*.bb \
-${PKGDIR}/packages/wview/*.bb \
-${PKGDIR}/packages/xlibs/*.bb \
-${PKGDIR}/packages/xextensions/*.bb \
-${PKGDIR}/packages/xinetd/*.bb \
-${PKGDIR}/packages/xproto/*.bb \
-${PKGDIR}/packages/zd1211/*.bb \
-${PKGDIR}/packages/zip/*.bb \
-${PKGDIR}/packages/zlib/*.bb \
-${SLUGOS_EXTRA_BBFILES}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index c0401d93d3..a26a069fa0 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -3,28 +3,7 @@
 #@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
 
 # WARNING: this file should not be used directly, use one of
-# the supported slugos-???.conf instead:
-
-# Explanation of the naming
-#
-# slugos-dist - the base distro configuration for an NSLU2
-# slugos-[bl][at][gu] - a specific configuration encoded as follows:
-#
-#  b or l - big or little endian
-#
-#  a or t - ARM or Thumb instructions in the low level libraries
-#         set ARM_INSTRUCTION_SET to match
-#
-#  g or u - glibc or uclibc libc implementation
-#         set TARGET_OS to match
-#
-# The following names are deprecated:
-#
-# openslug - the historical name of a canonical slugos-bag distro
-#            also the name of a standard slugos-bag distro with a package feed
-# ucslugc  - the historical (and obsolete) name of slugos-btu
-#            also the name of a standard slugos-btu distro with a package feed
-#
+# the supported slugos-derived distributions instead.
 
 #----------------------------------------------------------------------------------
 # STANDARD SLUGOS DEFINITIONS
@@ -33,6 +12,8 @@
 #
 #DISTRO_NAME
 #DISTRO_TYPE
+#ARM_INSTRUCTION_SET "arm" or "thumb"
+#TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
 SLUGOS_VERSION = "4.3"
@@ -42,11 +23,7 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 
-# The following must also be set, they define the basic format of the build
-#
-#ARM_INSTRUCTION_SET "arm" or "thumb"
-#TARGET_OS "linux" or "linux-uclibc"
-#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format)
+IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}"
 
 # The following need not be set, the defaults should be adequate
 #USE_NLS = "no" or "yes"
@@ -62,21 +39,19 @@ TARGET_FPU = "soft"
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += "package_ipk debian"
-
-DISTRO_BASE = ":slugos"
-
-# 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}"
+INHERIT += "package_ipk debian multimachine"
 
-# 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.
-# require conf/distro/include/freeze.conf
+# 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"
 
 #----------------------------------------------------------------------------------
 # FEEDS
@@ -84,21 +59,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
 #  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).
-# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which
-# will work on any derived distro.  The slugos-???.conf files set the FEED_URIS to
-# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building
-# such a feed:
 #
-#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}"
-#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}"
-#
-# When such a feed exists the corresponding 'unstable' feed will normally also
-# exist - the packages in unstable are the latest but very unlikely to be the
-# greatest.  Use at your own risk!
-# 
-#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable"
-#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}"
 
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
@@ -111,20 +74,6 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
-# Building a full image.  If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete
-# 8MByte flash image will be built after the rootfs JFFS2 image.  Other options
-# may later be defined for other vendor-flashable image types.
-#
-# 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
 # --------------
 # SlugOS builds an image with no extra packages - to add packages to the
@@ -154,8 +103,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 
-# compiler/binary/library versions (unslung uses different ones so these
-# cannot be in ${MACHINE}.conf)
+# compiler/binary/library versions
 PREFERRED_VERSION_binutils ?= "2.16"
 PREFERRED_VERSION_binutils-cross ?= "2.16"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
@@ -189,6 +137,8 @@ SRCDATE_irssi ?= "20050930"
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
 
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+
 PREFERRED_VERSION_ipkg ?= "0.99.154"
 PREFERRED_VERSION_ipkg-native ?= "0.99.154"
 
diff --git a/conf/distro/include/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc
deleted file mode 100644
index 3b3e9fca75..0000000000
--- a/conf/distro/include/ucslugc-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}"
-require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/unslung-packages.inc b/conf/distro/include/unslung-packages.inc
deleted file mode 100644
index e889a65df5..0000000000
--- a/conf/distro/include/unslung-packages.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-BBFILES := "\
-${PKGDIR}/packages/autoconf/*.bb \
-${PKGDIR}/packages/automake/*.bb \
-${PKGDIR}/packages/binutils/*.bb \
-${PKGDIR}/packages/bison/*.bb \
-${PKGDIR}/packages/busybox/*.bb \
-${PKGDIR}/packages/cpio/*.bb \
-${PKGDIR}/packages/devio/*.bb \
-${PKGDIR}/packages/fakeroot/*.bb \
-${PKGDIR}/packages/file/*.bb \
-${PKGDIR}/packages/findutils/*.bb \
-${PKGDIR}/packages/flex/*.bb \
-${PKGDIR}/packages/freeze/*.bb \
-${PKGDIR}/packages/gcc/*.bb \
-${PKGDIR}/packages/genext2fs/*.bb \
-${PKGDIR}/packages/gettext/*.bb \
-${PKGDIR}/packages/glibc/*.bb \
-${PKGDIR}/packages/gnu-config/*.bb \
-${PKGDIR}/packages/ipkg-utils/*.bb \
-${PKGDIR}/packages/ipkg/*.bb \
-${PKGDIR}/packages/libtool/*.bb \
-${PKGDIR}/packages/linux-libc-headers/*.bb \
-${PKGDIR}/packages/linux/*.bb \
-${PKGDIR}/packages/m4/*.bb \
-${PKGDIR}/packages/makedevs/*.bb \
-${PKGDIR}/packages/meta/*.bb \
-${PKGDIR}/packages/modutils/*.bb \
-${PKGDIR}/packages/mtd/*.bb \
-${PKGDIR}/packages/nslu2-binary-only/*.bb \
-${PKGDIR}/packages/pkgconfig/*.bb \
-${PKGDIR}/packages/portmap/*.bb \
-${PKGDIR}/packages/python/*.bb \
-${PKGDIR}/packages/quilt/*.bb \
-${PKGDIR}/packages/slugimage/*.bb \
-${PKGDIR}/packages/unzip/*.bb \
-${PKGDIR}/packages/update-modules/*.bb \
-${PKGDIR}/packages/wget/*.bb \
-${PKGDIR}/packages/wireless-tools/*.bb \
-${PKGDIR}/packages/zlib/*.bb \
-${PKGDIR}/packages/zd1211/*.bb \
-${UNSLUNG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
index 7452c26eaa..ac77532697 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/openslug-native.conf
@@ -1,6 +1,9 @@
+# Our build host is armeb, not armv5eb that the kernel reports
+BUILD_ARCH = "armeb"
+
 require conf/distro/openslug.conf
 
-# Corresponting packages should be in openslug-native.bb,
+# Corresponding packages should be in openslug-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
 ASSUME_PROVIDED = "libtool-cross \
 		   libtool-native \
@@ -15,6 +18,3 @@ ASSUME_PROVIDED = "libtool-cross \
 		   update-rc.d \
 		   "
 
-# Our build host is armeb, not armv5eb that the kernel reports
-BUILD_ARCH = "armeb"
-
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 02becf3bae..f03c4f653e 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,131 +2,10 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
-#----------------------------------------------------------------------------------
-# STANDARD OpenSlug DEFINITIONS
-#----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "openslug"
-SLUGOS_IMAGESEX  = "big-endian"
+IMAGE_BASENAME = "openslug"
+TARGET_ARCH = "armeb"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
 
-# openslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "1"
-
-# 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
-# directory
-OPENSLUG_EXTRA_BBFILES ?= ""
-
-#----------------------------------------------------------------------------------
-# FIRMWARE CONFIGURATION
-#----------------------------------------------------------------------------------
-# 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.
-# NOTE: only jffs2 support is an absolute requirement of boot, even
-# the ext2/ext3 support is optional!
-OPENSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
-
-# 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_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 and ext3 support
-# 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_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
-
-# 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_RDEPENDS += "lrzsz"
-
-# Filesystem selection.  Adding entries here adds the module to the
-# image.  The module must be built as part of nslu2-kernel (i.e. it
-# must be specified as a module in the defconfig file).  The NLS
-# support charset modules must be given explicitly and must match
-# the codepage/iocharset and NLS handling for the file systems which
-# require them.  The installed lanugage set is minimal but sufficient
-# for any file system (since it uses utf8).  See
-# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
-# 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.)
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ext2 \
-kernel-module-jbd \
-kernel-module-ext3 \
-kernel-module-vfat \
-kernel-module-ntfs \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-nls-cp437 \
-kernel-module-nls-utf8 \
-"
-
-# Add daemon required for HW RNG support
-OPENSLUG_STANDARD_RDEPENDS += "\
-rng-tools \
-"
-
-# Add modules required for usb support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ohci-hcd \
-kernel-module-uhci-hcd \
-"
-
-# Add modules required for IDE support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-libata \
-kernel-module-pata-artop \
-"
-
-# Add modules required for Network support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-via-velocity \
-"
-
-# This documents other file systems which are built but not installed
-# by default in the flash image.
-#
-# kernel-module-msdos - mounts a FAT file system without long file names
-#                       (use kernel-module-vfat, it shows the long names
-#                       if present.)
-
-# 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 nslu2-bag for a more minimal configuration and some
-# more instructions about how to make a non-openslug image.
-OPENSLUG_EXTRA_RDEPENDS ?= ""
-SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS} ${OPENSLUG_EXTRA_RDEPENDS}"
-
-#----------------------------------------------------------------------------------
-# PACKAGE VERSION CONTROL
-#----------------------------------------------------------------------------------
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-
-#----------------------------------------------------------------------------------
-# BASE VERSION SELECTION
-#----------------------------------------------------------------------------------
-# b - big-endian
-# a - ARM instruction set
-# g - glibc
-#
-require conf/distro/slugos-bag.conf
+require conf/distro/slugos.conf
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
deleted file mode 100644
index 23e8690752..0000000000
--- a/conf/distro/slugos-bag.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-BAG
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# See slugos.conf for an explanation of this file.
-
-# This slugos variant corresponds to OpenSlug
-DISTRO_NAME ?= "slugos-bag"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "beta"
-
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-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}"
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
deleted file mode 100644
index 5e461ff063..0000000000
--- a/conf/distro/slugos-bau.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-BAU
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# See slugos.conf for an explanation of this file.
-
-# This slugos variant is not supported - there are no nslu2-linux.org
-# regular builds and there is no feed.
-DISTRO_NAME ?= "slugos-bau"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "alpha"
-
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
deleted file mode 100644
index 4fbdd9e37b..0000000000
--- a/conf/distro/slugos-btu.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-BTU
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# See slugos.conf for an explanation of this file.
-
-# This slugos variant corresponds to UcSlugC
-DISTRO_NAME ?= "slugos-btu"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "beta"
-
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "thumb"
-TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}"
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
deleted file mode 100644
index 838d6cf48b..0000000000
--- a/conf/distro/slugos-lag.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-LAG
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# See slugos.conf for an explanation of this file.
-
-# This slugos variant corresponds to DebianSlug
-DISTRO_NAME ?= "slugos-lag"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "beta"
-
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
-
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
deleted file mode 100644
index 7294c1dfd2..0000000000
--- a/conf/distro/slugos-lau.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-LAU
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# This slugos variant is not supported - there are no nslu2-linux.org
-# regular builds and there is no feed.
-DISTRO_NAME ?= "slugos-lau"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "alpha"
-
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-# no feeds
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
deleted file mode 100644
index 53fbb407a7..0000000000
--- a/conf/distro/slugos-ltu.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SLUGOS-LTU
-#@DESCRIPTION: Linux Distribution for the NSLU2
-
-# See slugos.conf for an explanation of this file.
-
-DISTRO_NAME ?= "slugos-ltu"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED ?= "unstable"
-DISTRO_TYPE ?= "beta"
-
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "thumb"
-TARGET_OS = "linux-uclibc"
-SLUGOS_IMAGESEX  ?= "big-endian"
-
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}"
-
-
-require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
new file mode 100644
index 0000000000..32b047aeae
--- /dev/null
+++ b/conf/distro/slugos.conf
@@ -0,0 +1,110 @@
+#@TYPE: Distribution
+#@NAME: SlugOS
+#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
+
+#----------------------------------------------------------------------------------
+# STANDARD SlugOS/BE DEFINITIONS
+#----------------------------------------------------------------------------------
+DISTRO_NAME = "SlugOS"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# DISTRO_FEED = "unstable"
+DISTRO_TYPE = "beta"
+TARGET_ARCH ?= "armeb"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
+
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# 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.
+# NOTE: only jffs2 support is an absolute requirement of boot, even
+# the ext2/ext3 support is optional!
+SLUGOS_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+
+# The standard firmware contents and additional packages built as requirements
+# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS.
+SLUGOS_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the slugos
+# image, programs to format disks with these file systems may be
+# added or removed.  By default ext2 and ext3 support
+# 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.
+SLUGOS_STANDARD_RDEPENDS += "${SLUGOS_EXT2_PROGS}"
+
+# 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.)
+SLUGOS_STANDARD_RDEPENDS += "lrzsz"
+
+# Filesystem selection.  Adding entries here adds the module to the
+# image.  The module must be built as part of nslu2-kernel (i.e. it
+# must be specified as a module in the defconfig file).  The NLS
+# support charset modules must be given explicitly and must match
+# the codepage/iocharset and NLS handling for the file systems which
+# require them.  The installed lanugage set is minimal but sufficient
+# for any file system (since it uses utf8).  See
+# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
+# 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.)
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-ext2 \
+kernel-module-jbd \
+kernel-module-ext3 \
+kernel-module-vfat \
+kernel-module-ntfs \
+kernel-module-isofs \
+kernel-module-udf \
+kernel-module-nls-cp437 \
+kernel-module-nls-utf8 \
+"
+
+# Add daemon required for HW RNG support
+SLUGOS_STANDARD_RDEPENDS += "\
+rng-tools \
+"
+
+# Add modules required for usb support
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+"
+
+# Add modules required for IDE support
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
+# Add modules required for Network support
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
+# This documents other file systems which are built but not installed
+# by default in the flash image.
+#
+# kernel-module-msdos - mounts a FAT file system without long file names
+#                       (use kernel-module-vfat, it shows the long names
+#                       if present.)
+
+# 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 SlugOS.
+SLUGOS_EXTRA_RDEPENDS = "${SLUGOS_STANDARD_RDEPENDS}"
+
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 81d5ea7397..8b64746fe3 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -2,29 +2,14 @@
 #@NAME: UcSlugC
 #@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2
 
-# This is SLUGOS-BTU with a different name...
 DISTRO_NAME = "UcSlugC"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "ucslugc"
-SLUGOS_IMAGESEX  = "big-endian"
+IMAGE_BASENAME = "ucslugc"
+TARGET_ARCH = "armeb"
+ARM_INSTRUCTION_SET = "thumb"
+TARGET_OS = "linux-uclibc"
 
 PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
 PREFERRED_VERSION_gcc-cross = "3.4.4"
 PREFERRED_VERSION_gcc = "3.4.4"
 
-# 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
-UCSLUGC_EXTRA_BBFILES ?= ""
-
-# For compatibility with the old way of overriding these settings names with the
-# prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
-# setting - either may be set in local.conf to override these values.
-UCSLUGC_EXTRA_RDEPENDS ?= ""
-
-#
-SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
-
-require conf/distro/slugos-btu.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index b25b94d79f..f7ea4ded4d 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -10,10 +10,6 @@ FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stabl
 FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
 FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
 
-# pull in the frozen list of bbfiles
-# UNSLUNG_EXTRA_BBFILES ?= ""
-# require conf/distro/include/freeze.inc
-
 TARGET_FPU = "soft"
 TARGET_OS = "linux"