diff options
| author |   Rod Whitby <rod@whitby.id.au> | 2005-05-04 14:42:02 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-05-04 14:42:02 +0000 |
| commit | 7b7590ca7af5f4b68365dbc4315b333e44d3493c (patch) | |
| tree | a1ef9371b3d888d705fe3ba9fa8aec0e2a5ec835 /classes | |
| parent | 32076690a4804afae16f07d26f18d2ac9a030a6a (diff) | |
| download | openembedded-7b7590ca7af5f4b68365dbc4315b333e44d3493c.tar.gz | |
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/05/04 14:41:13+00:00 (none)!rwhitby
Unslung/OpenSlug: Removed all trace of switchbox
BKrev: 4278df3aX1WDF_UNmDjNP7ReUMoQxg
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/nslu2_flashimg.bbclass | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/classes/nslu2_flashimg.bbclass b/classes/nslu2_flashimg.bbclass index ddb9b5e8cf..56ad0f0659 100644 --- a/classes/nslu2_flashimg.bbclass +++ b/classes/nslu2_flashimg.bbclass @@ -5,25 +5,14 @@ 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 - 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 install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 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 ${NSLU2_SLUGIMAGE_ARGS} - fi - slugimage -p -b RedBoot -s SysConf -r Ramdisk:switchbox.ext2.gz,Flashdisk:flashdisk.jffs2 -t Trailer \ + slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img ${NSLU2_SLUGIMAGE_ARGS} rm -rf ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware' +EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " |