merge of 878c33f63dddf26432371b39e5ac632427adb9a9

     and f27802cb19bc2b8066af4e34ef08a08acd4f6203

6 files changed, 63 insertions, 9 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 78e3cc0378..b5a580d97b 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -15,7 +15,7 @@ TARGET_OS = "linux"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += " package_ipk debian nslu2_flashimg"
+INHERIT += " package_ipk debian nslu2-jffs2-image"
 
 # 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
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 0376eadd00..39251c5375 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -19,7 +19,7 @@ ARM_INTERWORK = ":thumb-interwork"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += " package_ipk debian nslu2_flashimg"
+INHERIT += " package_ipk debian nslu2-jffs2-image"
 
 # The OVERRIDES are modified here so that 'openslug' overrides are picked up if
 # present (ucslugc overrides take precedence).
diff --git a/conf/distro/unslung-binary-kernel.conf b/conf/distro/unslung-binary-kernel.conf
new file mode 100644
index 0000000000..9394ba4475
--- /dev/null
+++ b/conf/distro/unslung-binary-kernel.conf
@@ -0,0 +1,52 @@
+#@TYPE: Distribution
+#@NAME: Unslung 
+#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
+
+FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
+
+DISTRO_NAME = "Unslung"
+DISTRO_VERSION = "6.0-beta"
+DISTRO_TYPE = "beta"
+
+# pull in the frozen list of bbfiles
+UNSLUNG_EXTRA_BBFILES ?= ""
+include conf/distro/freeze.conf
+
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+INHERIT += " package_ipk nslu2-ramdisk-image"
+
+IMAGE_FSTYPE = "ext2.gz"
+UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
+EXTRA_IMAGECMD_ext2.gz = "-D ${UNSLUNG_DEVICE_TABLE}"
+IMAGE_ROOTFS_SIZE_ext2.gz = "14000"
+
+UNSLUNG_EXTRA_DEPENDS  ?= ""
+UNSLUNG_EXTRA_RDEPENDS ?= "\
+kernel-module-usbnet \
+kernel-module-pegasus kernel-module-kaweth \
+kernel-module-usbserial \
+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"
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
+PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf
index 1f41b1e846..3e9059fae8 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/unslung-packages.conf
@@ -12,6 +12,7 @@ ${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 \
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 75c251f220..06331707fc 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
 FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.5-beta"
+DISTRO_VERSION = "5.6-alpha"
 DISTRO_TYPE = "beta"
 
 # pull in the frozen list of bbfiles
@@ -19,7 +19,7 @@ TARGET_OS = "linux"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-INHERIT += " package_ipk nslu2_flashimg"
+INHERIT += " package_ipk nslu2-jffs2-image"
 
 IMAGE_FSTYPE = "jffs2"
 UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
@@ -43,3 +43,9 @@ PREFERRED_VERSION_glibc ?= "2.2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.2.5"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29"
+PREFERRED_VERSION_unslung-rootfs         ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r29"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 3a9a9d9730..1616299ae9 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -120,11 +120,6 @@ NSLU2_PACKAGE_ARCH = "${@['thumbv5tb', 'armv5teb'][bb.data.getVar('ARM_INSTRUCTI
 #-------------------------------------------------------------------------------
 # Miscellany
 #-------------------------------------------------------------------------------
-# JBowler(20050811): I don't think any of the following are required (now).
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-IMAGE_ROOTFS_SIZE_ext2 = "10240"
-IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
-
 SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"