Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/bitkeeper/openembedded

2005/06/13 08:54:44+09:30 (none)!rwhitby
Unlsung 5.5-beta: no change from 5.4-alpha, ready for work to begin on the binary release.

BKrev: 42acc4b4a8LbiAtJKLSFk1np0v9mVA

diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 575296e..7389a33 100644 (file)
--- 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.4-alpha"
+DISTRO_VERSION = "5.5-beta"
 DISTRO_TYPE = "beta"
 
 TARGET_FPU = "soft"

diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES
index 691b921..dedc243 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@ -443,3 +443,7 @@ Removed unused /mnt/sda1, /mnt/sda2, /mnt/sdb1, and /mnt/sdb2.
 Disabled the download process (superceded by upgrade mode).
 Disabled the generation of the "ourtelnetrescue" user (too insecure).
 Added disk auto-wait countdown to /linuxrc (courtesy of glc).
+
+5.5:
+
+First public release of 5.x firmware.

diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb
index b785481..af0ad3d 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r29.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "nslu2-linksys-libs"