Unslung and OpenSlug both working with switchbox. Updated CVSDATE stuff in nslu2.conf. Changed CMDLINE in openslug kernel to use switchbox. Changed switchbox and slingbox to use /usr/sbin and /usr/bin (just like in OpenSlug busybox) so that the location of executables match across SwitchBox, Unslung and Openslug. Added /initrd directory to OpenSlug rootfs so that it can be used for the pivot_root in switchbox.

BKrev: 4219dc0fM9IKay9jW_b1WMSP_N7e1w

9 files changed, 21 insertions, 14 deletions

diff --git a/packages/base-files/base-files/nslu2/fstab b/packages/base-files/base-files/nslu2/fstab
index e69de29bb2..941dfa3805 100644
--- a/packages/base-files/base-files/nslu2/fstab
+++ b/packages/base-files/base-files/nslu2/fstab
@@ -0,0 +1,5 @@
+rootfs		/		auto	defaults	1  1
+proc            /proc		proc    defaults        0  0
+tmpfs		/var		tmpfs	defaults	0  0
+tmpfs		/mnt/ram	tmpfs	defaults	0  0
+usbdevfs	/proc/bus/usb	usbdevfs noauto		0  0
diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig
index 001b79b775..192d218d57 100644
--- a/packages/busybox/slingbox-1.00/defconfig
+++ b/packages/busybox/slingbox-1.00/defconfig
@@ -30,7 +30,7 @@ EXTRA_CFLAGS_OPTIONS=""
 #
 # Installation Options
 #
-CONFIG_INSTALL_NO_USR=y
+# CONFIG_INSTALL_NO_USR is not set
 PREFIX="/"
 
 #
diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
index eeb9622353..7429f8a101 100644
--- a/packages/busybox/slingbox_1.00.bb
+++ b/packages/busybox/slingbox_1.00.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -22,7 +22,7 @@ export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
 PACKAGES = "${PN}"
-FILES_${PN} = "/bin /sbin"
+FILES_${PN} = "/"
 FILES_${PN}-doc = ""
 FILES_${PN}-dev = ""
 FILES_${PN}-locale = ""
diff --git a/packages/busybox/switchbox-1.00/defconfig b/packages/busybox/switchbox-1.00/defconfig
index 40f6b415e5..ad94247847 100644
--- a/packages/busybox/switchbox-1.00/defconfig
+++ b/packages/busybox/switchbox-1.00/defconfig
@@ -31,7 +31,7 @@ EXTRA_CFLAGS_OPTIONS=""
 #
 # Installation Options
 #
-CONFIG_INSTALL_NO_USR=y
+# CONFIG_INSTALL_NO_USR is not set
 PREFIX="/"
 
 #
diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index 90e365158d..da500300c3 100644
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -7,14 +7,14 @@ prefroot=
 /bin/mount -t proc proc /proc
 /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
 
-sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | hexdump -n 6 -e '"%02d"'`
+sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | /usr/bin/hexdump -n 6 -e '"%02d"'`
 ipaddr=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep ip_addr | sed -e s/ip_addr=//`
 netmask=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep netmask | sed -e s/netmask=//`
 gateway=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep gateway | sed -e s/gateway=//`
 nfsrootloc=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 1`
 nfsrootopts=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 2- | sed -e s/\"//g` 
 device=/dev/`/bin/sed -n -e 's/^\(mtd[0-9]*\): .* "FIS directory"/\1/p' /proc/mtd`   
-length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /bin/hexdump -n 4 -e '4/1 "%02X"' $device`
+length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /usr/bin/hexdump -n 4 -e '4/1 "%02X"' $device`
 
 # Determine desired rootfs
 if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then
@@ -144,7 +144,7 @@ fi
 # Pivot
 if [ -n "$mounted" ] ; then
     if [ $prefroot = "nfsroot" ] ; then
-	/bin/killall portmap
+	/usr/bin/killall portmap
     fi
     if [ $mounted != "/mnt/jffs2" ] ; then
         sleep 1
@@ -162,7 +162,7 @@ if [ -n "$mounted" ] ; then
 	runboot=/bin/sh
     fi
     /sbin/pivot_root . initrd
-    exec chroot . $runboot  < dev/console > dev/console 2>&1
+    exec /usr/sbin/chroot . $runboot  < dev/console > dev/console 2>&1
 fi
 
 #if [ -z "$mounted" ] ; then
diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb
index 9d5b86cd82..c8d3ff5933 100644
--- a/packages/busybox/switchbox_1.00.bb
+++ b/packages/busybox/switchbox_1.00.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r7"
+PR = "r9"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
diff --git a/packages/linux/openslug-kernel_2.6.9.bb b/packages/linux/openslug-kernel_2.6.9.bb
index a4ee115f92..15497bfab9 100644
--- a/packages/linux/openslug-kernel_2.6.9.bb
+++ b/packages/linux/openslug-kernel_2.6.9.bb
@@ -28,8 +28,8 @@ ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
 CMDLINE_CONSOLE ?= "ttyS0,115200n8"
 #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
-CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
-#CMDLINE_ROOT = "root=/dev/ram0 rootfstype=ext2,jffs2 initrd=0x01000000,10M /init=/linuxrc mem=32M@0x00000000"
+#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+CMDLINE_ROOT = "root=/dev/ram0 rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
 CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
 
 do_configure_prepend() {
diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
index 0ed74e207a..9778896c04 100644
--- a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
+++ b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
@@ -2,9 +2,9 @@ SECTION = "base"
 DEPENDS = ""
 PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r15"
+PR = "r16"
 
-SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.7.tar.gz"
+SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.8.tar.gz"
 S = "${WORKDIR}"
 
 python () {
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 731f6def4a..ed5b440386 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Openslug initial network config via sysconf"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://sysconfsetup \
 	   file://kern_header.c"
@@ -28,3 +28,5 @@ do_install() {
 	install -m 0755 ${D}/../sysconfsetup ${D}/${sysconfdir}/init.d/
 	ln  -s /etc/init.d/sysconfsetup ${D}/${sysconfdir}/rcS.d/S39sysconfsetup
 }
+
+FILES_${PN} += "/initrd"