diff options
| author | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-01-18 16:31:15 +0000 |
|---|---|---|
| committer | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-01-18 16:31:15 +0000 |
| commit | e37195af4083ffd12f0f2071ef2f80c0bb7b4e1b (patch) | |
| tree | c0fcf5aaacb700735983779e43e50f1910273407 | |
| parent | b4be67619fccdab84a2e3cd6158c75cb38ab0524 (diff) | |
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded
2005/01/18 10:37:25-05:00 giantshoulder.com!g2
OpenSlug/Switchbox fixes for OpenSlug boot
BKrev: 41ed39d3t5lp5aNUWTjb6AWRB_HSww
| -rw-r--r-- | BitKeeper/etc/ignore | 1 | ||||
| -rw-r--r-- | packages/busybox/switchbox-1.00/linuxrc | 2 | ||||
| -rw-r--r-- | packages/busybox/switchbox_1.00.bb | 2 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/nslu2-switchbox-firmware.bb | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index fd5b1c4d04..86dbb5e508 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -7,3 +7,4 @@ meta/treke-image.oe patches .pc packages/find_no_ver.sh +packages/linux/openslug-kernel-2.6.9/fp_lenert_float64.patch diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc index d4584c8030..cd49b16ccf 100644 --- a/packages/busybox/switchbox-1.00/linuxrc +++ b/packages/busybox/switchbox-1.00/linuxrc @@ -7,7 +7,7 @@ mounted= if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then - if [ -e /mnt/tmpmnt/sbin/init -o -e /mnt/tmpmnt/bin/init ] ; then + if [ -x /mnt/tmpmnt/sbin/init -o -L /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init -o -L /mnt/tmpmnt/bin/init ] ; then if [ -f /mnt/tmpmnt/.recovery ] ; then mounted= elif [ -f /mnt/tmpmnt/.ramdisk ] ; then diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb index 6367688d17..3e86966411 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 = "r5" +PR = "r6" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb index fb6b1c066d..292271a7c5 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 = "r9" +PR = "r10" -SRC_URI = "http://nslu.sf.net/downloads/switchbox-3.8.tar.gz" +SRC_URI = "http://nslu.sf.net/downloads/switchbox-3.9.tar.gz" S = "${WORKDIR}" python () { |