diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-19 22:08:54 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-19 22:08:54 +0000 |
| commit | 59fd4d418a6c940c5eab9e3a6b47ed4566312116 (patch) | |
| tree | c9ced18f0b6b857b41d8eb4ed2b7c738138576ee /busybox | |
| parent | 44b173fc64ac7e67ab17cb727f0a4de0e02f7e78 (diff) | |
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into hyperion.kergoth.com:/home/kergoth/code/packages
2004/11/19 13:40:41-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages
2004/11/20 00:53:51+10:30 (none)!rwhitby
Removed booting from external disks from switchbox (still exists in unslung ramdisk image). Updated ext3flash functionality for jffs2 support. Removed errant symlink in OE repo. Updated unslung and openslug to use switchbox version 3.3 (which no longer has the 10 second delay).
2004/11/19 05:03:18-08:00 (none)!jacques
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/packages/oe/nslu2/packages
2004/11/19 04:59:56-08:00 (none)!jacques
removed dependency of openslug-image on task-bootstrap
2004/11/19 00:35:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages
2004/11/18 22:52:46+10:30 (none)!rwhitby
Forgot to add ixp4xx-csr and ixp425-eth to DEPENDS too.
2004/11/18 22:47:43+10:30 (none)!rwhitby
Third try at adding ixp4xx-csr and ixp425-eth to openslug.
2004/11/18 22:42:02+10:30 (none)!rwhitby
ixp4xx-csr.
2004/11/18 22:37:35+10:30 (none)!rwhitby
Added ixp4xx-csr and ixp425-eth to openslug.
2004/11/18 21:42:02+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages
2004/11/18 21:41:25+10:30 (none)!rwhitby
Added the build timing annoyance patch to ixp4xx-csr.
2004/11/17 23:44:00-08:00 (none)!jacques
removed hdparm because it does not build
2004/11/17 23:11:47-08:00 (none)!jacques
updated openslug-specific busybox defconfig
2004/11/17 22:08:07-08:00 (none)!jacques
fixed bugs in ixp4xx-csr and ixp425-eth builds
2004/11/17 21:37:36-08:00 (none)!jacques
added openslug-specific busybox defconfig
2004/11/17 19:02:44-08:00 (none)!jacques
turned down jffs2 logging level (to 0)
2004/11/17 18:17:26-08:00 (none)!jacques
don't attempt to install ext2.gz ramdisk if NSLU2_BUILD_RAMDISK_FIRMWARE is not true
2004/11/18 10:56:25+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages
2004/11/18 10:55:51+10:30 (none)!rwhitby
Obsoleted openslug ramdisk image in favour of a flashdisk image.
2004/11/17 15:25:04-08:00 (none)!jacques
added -f to cp in do_stage to overwrite read-only files on subsequent builds
2004/11/18 08:22:26+10:30 (none)!rwhitby
Changed openslug kernel root device back to /dev/ram0 until we work out how to switch it the right way for the flashdisk firmware.
BKrev: 419e6ef6Cp7JjJfWEZ29tcJDuVKyMw
Diffstat (limited to 'busybox')
| -rw-r--r-- | busybox/busybox-1.00/openslug/defconfig | 0 | ||||
| -rw-r--r-- | busybox/switchbox-1.00/linuxrc | 36 | ||||
| -rw-r--r-- | busybox/switchbox_1.00.oe | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/busybox/busybox-1.00/openslug/defconfig b/busybox/busybox-1.00/openslug/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/busybox/busybox-1.00/openslug/defconfig diff --git a/busybox/switchbox-1.00/linuxrc b/busybox/switchbox-1.00/linuxrc index 70ad6855b6..858bac7258 100644 --- a/busybox/switchbox-1.00/linuxrc +++ b/busybox/switchbox-1.00/linuxrc @@ -5,36 +5,6 @@ mounted= /bin/mount -t proc proc /proc /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev -/bin/sleep 10 - -if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sda2 /mnt/tmpmnt ; then - - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then - /bin/echo "Root filesystem will be mounted from /dev/sda2 ..." - /bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`" - mounted=/mnt/tmpmnt - /bin/echo "0x0802" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc - fi - - /bin/umount /mnt/tmpmnt -fi - -if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sdb2 /mnt/tmpmnt ; then - - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then - /bin/echo "Root filesystem will be mounted from /dev/sdb2 ..." - /bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`" - mounted=/mnt/tmpmnt - /bin/echo "0x0812" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc - fi - - /bin/umount /mnt/tmpmnt -fi - if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then if [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then @@ -47,13 +17,11 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then fi if [ -z "$mounted" ] ; then - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then + + if [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then /bin/echo "Root filesystem will be mounted from /dev/ram0 ..." - /bin/echo "Firmware Version: `/bin/cat /.unslung`" mounted=/mnt/tmpmnt /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc fi fi diff --git a/busybox/switchbox_1.00.oe b/busybox/switchbox_1.00.oe index 2536e46eef..42b82d8a9d 100644 --- a/busybox/switchbox_1.00.oe +++ b/busybox/switchbox_1.00.oe @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ |