summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-11-17 07:53:50 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-11-17 07:53:50 +0000
commit655aa8c859a04f87a9a07a52a2b700c644082aa5 (patch)
tree81618d5a9beab43d297bea8c505e8322e4bdb0aa /classes
parent259cbc30feb02f7e320db981a88354919daa0537 (diff)
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/17 07:16:00+10:30 (none)!rwhitby Unslung now generates jffs2 images too 2004/11/16 22:13:02+10:30 (none)!rwhitby Switchbox now drops to shell if a valid rootfs cannot be mounted 2004/11/16 21:51:03+10:30 (none)!rwhitby Changed switchbox back to ext2.gz 2004/11/16 20:07:19+10:30 (none)!rwhitby Merge 2004/11/16 20:05:22+10:30 (none)!rwhitby Created switchbox distro 2004/11/16 00:14:27-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/16 00:12:50-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/15 22:52:37-08:00 (none)!jacques added nslu2-linksys-libs to UNSLUNG_BASE_PACKAGES removed makedevs 2004/11/15 19:28:14-08:00 (none)!jacques Removed unslung specific references from the switchbox linuxrc jffs2 stanza changed /bin/echo "0x1f04" to /bin/echo "0x0100" in ramfs stanza 2004/11/15 19:18:28-08:00 (none)!jacques removed init from switchbox and added loop block dev builtin to -able kernel BKrev: 419b038ez0VSSujPdTan9b9QhMaDrw
Diffstat (limited to 'classes')
-rw-r--r--classes/nslu2_flashimg.oeclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass
index 3e5fecf89d..8bca7ebf64 100644
--- a/classes/nslu2_flashimg.oeclass
+++ b/classes/nslu2_flashimg.oeclass
@@ -3,13 +3,17 @@ nslu2_pack_image () {
install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/Redboot \
${STAGING_LIBDIR}/nslu2-binaries/Trailer \
${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+ ${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
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.gz
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.ext2.gz
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
cd ${DEPLOY_DIR_IMAGE}/slug
- slugtool pack ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img
- rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug
+ slugimage -p -r Ramdisk:ramdisk.ext2.gz -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img
+ slugimage -p -r Ramdisk:switchbox.ext2.gz,Flashdisk:flashdisk.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img
+ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+ rm -rf ${DEPLOY_DIR_IMAGE}/slug
}
-EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-linksys-firmware'
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware'
IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "