diff options
Diffstat (limited to 'packages/busybox')
-rw-r--r-- | packages/busybox/slingbox-1.00/defconfig | 2 | ||||
-rw-r--r-- | packages/busybox/slingbox_1.00.bb | 4 | ||||
-rw-r--r-- | packages/busybox/switchbox-1.00/defconfig | 2 | ||||
-rw-r--r-- | packages/busybox/switchbox-1.00/linuxrc | 8 | ||||
-rw-r--r-- | packages/busybox/switchbox_1.00.bb | 2 |
5 files changed, 9 insertions, 9 deletions
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 \ |