Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 15:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 14:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 13:40:09-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 05:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 22:32:58+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2004/12/24 22:32:15+10:30 (none)!rwhitby
Unslung 3.13-alpha with recovery mode support

2004/12/24 03:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 02:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 01:40:15-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 19:00:07-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 16:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 13:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/24 07:20:15+10:30 (none)!rwhitby
Unslung 3.12-alpha, including the new maintenance mode

2004/12/23 12:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 08:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 07:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 04:40:09-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 03:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/23 02:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 18:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 15:40:09-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 13:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 12:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 09:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 06:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 05:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 03:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 01:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/22 00:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 23:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 22:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 21:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 15:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 11:40:09-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 09:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 08:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 07:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 06:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 05:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/21 04:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 13:40:11-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 11:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 10:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 09:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 08:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 05:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/19 16:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/20 08:44:35+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2004/12/20 08:43:47+10:30 (none)!rwhitby
Unslung 3.11-alpha (including maintenance mode, which loads the jffs2 rootfs into a ramdisk if /.ramdisk exists in the jffs2 rootfs).

2004/12/19 11:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/19 09:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/19 08:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/19 07:40:09-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/19 05:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/18 14:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/18 11:40:11-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/18 05:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/17 23:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/17 23:12:58+10:30 (none)!rwhitby
Bumped the unslung-able package revision.

2004/12/17 23:11:28+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2004/12/17 23:10:13+10:30 (none)!rwhitby
Enabled NFS (both server and client) in unslung-able.  Some of it should really be modules, but we can sort that out later.

2004/12/16 23:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/16 16:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/16 10:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/15 22:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/15 15:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/15 09:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/15 22:09:59+10:30 (none)!rwhitby
Changed the RDEPENDS in the glibc_2.2.5.bb package for Unslung

2004/12/15 21:51:27+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2004/12/15 21:48:53+10:30 (none)!rwhitby
One more change for Unslung-3.10-alpha - fixes the previous changeset

2004/12/15 21:45:12+10:30 (none)!rwhitby
Couple more changes for Unslung-3.10-alpha - fixes it previous changeset

2004/12/15 21:34:46+10:30 (none)!rwhitby
Unslung 3.10-alpha: Added one extra sd{a,b,c} device. Added libc6-unslung to the root filesystem (for librt). Added rc.unslung-stop and called it during rc.reboot and rc.halt. Now diverts to rc.unslung-start (but still does rc.unslung as well for backwards compatibitily, but this will be removed in Unslung 4.x).

2004/12/15 01:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 14:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 11:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 10:40:04-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 09:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 06:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 09:31:16-05:00 uottawa.ca!stephane
Make use of links.conf in udev optional so to prevent ugly startup errors when it's missing.

2004/12/14 09:17:24-05:00 uottawa.ca!stephane
Merge bk://nslu2-linux.bkbits.net/openembedded
into gauss.mathstat.uottawa.ca:/local/openslug/openembedded

2004/12/14 09:15:12-05:00 uottawa.ca!stephane
Merge bk://oe-devel.bkbits.net/openembedded
into gauss.mathstat.uottawa.ca:/local/openslug/openembedded

2004/12/14 05:40:13-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 03:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/14 01:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/13 06:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 16:40:12-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 11:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 10:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 06:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 05:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/12 23:19:52+10:30 (none)!rwhitby
Moved the nslu2 kernel patch to nslu.sf.net

2004/12/11 16:40:04-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 14:40:06-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 13:40:04-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 07:40:10-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 06:40:05-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 04:40:08-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/11 20:27:05+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded

2004/12/11 20:26:08+10:30 (none)!rwhitby
Unslung 3.9 changeset - moved a number of -able kernel changes into -standard.

2004/12/10 16:40:07-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/10 15:40:15-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/10 13:12:25-08:00 bkbits.net!nslu2-linux.adm
Merge bkbits.net:/repos/o/oe-devel/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/10 16:10:40-05:00 uottawa.ca!stephane
Merge bk://oe-devel.bkbits.net/openembedded
into gauss.mathstat.uottawa.ca:/local/openslug/openembedded

2004/12/10 13:59:08-05:00 uottawa.ca!stephane
Merge bk://openembedded.bkbits.net/openembedded
into gauss.mathstat.uottawa.ca:/local/openslug/openembedded

2004/12/10 20:52:05+10:30 (none)!rwhitby
Set uclibc to a default stable working CVS date in nslu2.conf

BKrev: 41ccb6ee7vorPwpxhrZ3bxSSECTYZQ

1 files changed, 7 insertions, 2 deletions

diff --git a/classes/nslu2_flashimg.bbclass b/classes/nslu2_flashimg.bbclass
index dacf6e66d5..ddb9b5e8cf 100644
--- a/classes/nslu2_flashimg.bbclass
+++ b/classes/nslu2_flashimg.bbclass
@@ -1,3 +1,5 @@
+NSLU2_SLUGIMAGE_ARGS ?= ""
+
 nslu2_pack_image () {
 	install -d ${DEPLOY_DIR_IMAGE}/slug
 	install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
@@ -6,6 +8,9 @@ nslu2_pack_image () {
 			${STAGING_LIBDIR}/nslu2-binaries/switchbox.ext2.gz \
 			${DEPLOY_DIR_IMAGE}/slug/
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
+	if [ -f ${DEPLOY_DIR_IMAGE}/payload.tar.gz ] ; then
+	  install -m 0644 ${DEPLOY_DIR_IMAGE}/payload.tar.gz ${DEPLOY_DIR_IMAGE}/slug/payload.tar.gz
+	fi		
 	if [ "${NSLU2_BUILD_RAMDISK_FIRMWARE}" == "1" ] ; then
 	  install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.ext2.gz
 	fi
@@ -13,10 +18,10 @@ nslu2_pack_image () {
 	cd ${DEPLOY_DIR_IMAGE}/slug
 	if [ "${NSLU2_BUILD_RAMDISK_FIRMWARE}" == "1" ] ; then
 	  slugimage -p -b RedBoot -s SysConf -r Ramdisk:ramdisk.ext2.gz -t Trailer \
-	    -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img
+	    -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img ${NSLU2_SLUGIMAGE_ARGS}
 	fi
 	slugimage -p -b RedBoot -s SysConf -r Ramdisk:switchbox.ext2.gz,Flashdisk:flashdisk.jffs2 -t Trailer \
-	  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img
+	  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img ${NSLU2_SLUGIMAGE_ARGS}
 	rm -rf ${DEPLOY_DIR_IMAGE}/slug
 }