merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e

     and d510fe2c093aff12bc3223326057244c800701ad

5 files changed, 19 insertions, 16 deletions

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 22b041f521..1777135a0d 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,11 +3,11 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.6-beta"
+DISTRO_VERSION = "6.2-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
+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
@@ -57,8 +57,9 @@ 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"
+PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel"
+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/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 3b84269891..8752a6ed04 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
 
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
 MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r3"
+PR = "r4"
 
 KERNEL_SUFFIX = "unslung"
 
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index 7fa1b1cd4c..f9fda0aedc 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -1,5 +1,5 @@
 LICENSE = MIT
-PR = "r6"
+PR = "r7"
 
 IMAGE_BASENAME = "unslung"
 
@@ -31,6 +31,8 @@ unslung_clean_image () {
 	rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
 	# Tidy up some thing which are in the wrong place
 	mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/
+	# Remove the /lib/*.dat files cause they are too big
+	rm -f ${IMAGE_ROOTFS}/lib/*.dat
 	# Remove the ipkg symlink - unsling puts it back in
 	rm -f ${IMAGE_ROOTFS}${bindir}/ipkg
 	# Hack out the modutils stuff - it's too hard to make it work
diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling
index b784378812..c78bb7bbfe 100755
--- a/packages/nslu2-binary-only/unslung-rootfs/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs/unsling
@@ -12,22 +12,22 @@ fi
 if [ $# -eq 1 ] ; then
     if [ "$1" = "disk1" ] ; then
 	targ=/share/hdd/data
-	flag=.sda1root
+	flag=.sdb1root
     elif [ "$1" = "disk2" ] ; then
 	targ=/share/flash/data
-	flag=.sdb1root
+	flag=.sda1root
     elif [ "$1" = "hdd-data" ] ; then
 	targ=/share/hdd/data
-	flag=.sda1root
+	flag=.sdb1root
     elif [ "$1" = "hdd-conf" ] ; then
 	targ=/share/hdd/conf
-	flag=.sda2root
+	flag=.sdb2root
     elif [ "$1" = "flash-data" ] ; then
 	targ=/share/flash/data
-	flag=.sdb1root
+	flag=.sda1root
     elif [ "$1" = "flash-conf" ] ; then
 	targ=/share/flash/conf
-	flag=.sdb2root
+	flag=.sda2root
     else
 	echo $usage
 	exit 1
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 2f2e5e1866..7749db06d5 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "nslu2-linksys-libs"