Merge http://nslu2-linux.bkbits.net/packages

into handhelds.org:/home/kergoth/code/packages

2004/10/13 06:35:50-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/13 00:18:03+09:30 (none)!rwhitby
Merged in SECTION changes to nslu2 files

2004/10/13 00:13:58+09:30 (none)!rwhitby
Merge

2004/10/09 22:38:19-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/10 14:51:40+09:30 (none)!rwhitby
Created separate unslung-standard-image, unslung-ext3flash-image and unslung-vfatdisk2-image packages, each of which uses the corresponding nslu2 kernel.

2004/10/08 06:14:59-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/07 15:16:32-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/07 02:20:57-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/06 16:12:22-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/06 09:11:13+09:30 (none)!rwhitby
Added default and required definitions of TARGET_OS and TARGET_FPU to the Unslung and OpenSlug ditros

2004/10/05 02:41:44-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/04 21:26:48-04:00 rant-central.com!CodeWhacker
Stretch the ramdisk back up to 10M, the max size the kernel is set up for.

2004/10/03 23:34:21-04:00 rant-central.com!CodeWhacker
Add the modules needed to mount disks.

2004/09/30 23:03:04-04:00 rant-central.com!CodeWhacker
Reset ramdisk size to 8M.

2004/09/29 14:31:35-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/29 21:27:18+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/29 21:25:14+09:30 (none)!rwhitby
Commented out the calls to AM_PATH_PROG_WITH_TEST.  I have no idea whether this is the correct fix or not, but it is enough to get wget building again.

2004/09/29 02:51:24-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/29 07:04:16+09:30 (none)!rwhitby
Merge bk://nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/28 14:31:42-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/28 18:22:38+09:30 (none)!rwhitby
Merge bk://nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/28 08:41:19+09:30 (none)!rwhitby
Merge http://openembedded.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/27 16:19:13-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/28 00:08:45+09:30 (none)!rwhitby
Updated to unslung 2.2-alpha - unsling works, ipkg update works - need to work on base-files, sysvinit, update-rc.d, etc. now

2004/09/27 23:49:20+09:30 (none)!rwhitby
Back to where we where before splicing.  Now we should splice by adding ipkgs.

2004/09/27 23:19:44+09:30 (none)!rwhitby
Modifed a whole lot of unslung stuff to conform with the discussion with Kergoth.

2004/09/27 23:10:42+09:30 (none)!rwhitby
Added packages to recreate the nslu2 linksys firmware from scratch.

2004/09/27 22:08:57+09:30 (none)!rwhitby
Added /bin/tinylogin to the device table for the stock linksys nslu2 ramdisk

2004/09/27 22:01:08+09:30 (none)!rwhitby
Device table for the stock linksys nslu2 ramdisk

2004/09/27 21:46:23+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/27 21:45:41+09:30 (none)!rwhitby
Device table for the stock linksys nslu2 ramdisk

2004/09/26 16:03:29-04:00 rant-central.com!roy
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into rant-central.com:/home/roy/workspace/NSLU2/oe/packages

2004/09/26 16:01:26-04:00 rant-central.com!roy
Added the patch from http://groups.yahoo.com/group/nslu2-linux/message/1735 to address the ~60 sec hang during boot.

2004/09/27 00:28:15+09:30 (none)!rwhitby
Fixed some Unslung 2.1 errors

2004/09/27 00:04:13+09:30 (none)!rwhitby
Unslung 2.1: Faked out enough of sysvinit to allow dropbear to be installed

2004/09/26 20:21:39+09:30 (none)!rwhitby
Finalised a set of libc6 libraries which don't seem to cause any problems.

2004/09/26 12:51:18+09:30 (none)!rwhitby
Commented out the libc6 files - one of them is making it fail.

2004/09/26 10:16:44+09:30 (none)!rwhitby
Spliced in the rest of libc6, libgcc1, sed and wget

2004/09/26 08:08:35+09:30 (none)!rwhitby
nslu2-unslung-ramdisk now stashes the half-built ramdisk in nslu2-binries between do_compile and do_rootfs.

2004/09/25 15:17:05-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/25 14:17:26-04:00 rant-central.com!roy
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into rant-central.com:/home/roy/workspace/NSLU2/oe/packages

2004/09/25 14:13:49-04:00 rant-central.com!roy
Adds the USB networking modules to the openslug kernel build

2004/09/25 14:11:27-04:00 rant-central.com!roy
Adds export of 2 pci symbols the USB networking modules (and probably others) need.

2004/09/25 21:54:09+09:30 (none)!rwhitby
Unslung 2.0-alpha can now unsling disks and install old-style ipkgs from our Unslung 1.x repository.

2004/09/25 20:57:34+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/25 20:56:52+09:30 (none)!rwhitby
Spliced gcc lib and sed and minimal ipkg stuff

2004/09/24 18:44:21-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/25 01:02:41+09:30 (none)!rwhitby
Updated nslu2-unslung-ramdisk with next milestone - a rootfs built from ipks, some of which needs to be spliced into the ramdisk.

2004/09/24 22:54:57+09:30 (none)!rwhitby
Modified rootfs_ipk so that it would allow an empty IPKG_INSTALL (useful for building a rootfs up from scratch).

2004/09/24 22:39:08+09:30 (none)!rwhitby
Initial attempt at including a rootfs built from ipkgs

2004/09/24 22:35:13+09:30 (none)!rwhitby
Initial attempt at including a rootfs built from ipkgs

2004/09/24 08:04:37+09:30 (none)!rwhitby
Added a default kernel specification to unslung

BKrev: 416d97aarDhCyN_CmtJHZ0d3uwZiAQ

1 files changed, 2 insertions, 3 deletions

diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass
index f6170b9b73..ed8bbf7e59 100644
--- a/classes/nslu2_flashimg.oeclass
+++ b/classes/nslu2_flashimg.oeclass
@@ -4,12 +4,11 @@ nslu2_pack_image () {
 			${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 			${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 			${DEPLOY_DIR_IMAGE}/slug/
-	install -m 0644 ${STAGING_KERNEL_DIR}/zImage ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
+	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.gz
 	cd ${DEPLOY_DIR_IMAGE}/slug
 	slugtool pack ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img
-	rm -f ${DEPLOY_DIR_IMAGE}/zImage* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
-	rm -rf ${DEPLOY_DIR_IMAGE}/slug
+	rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug
 }
 
 EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-firmware-binary'