diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-11-28 03:45:42 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-11-28 03:45:42 +0000 |
| commit | e317d36907e7ea15518b8c237d4b1ce797553c59 (patch) | |
| tree | 2584813cfdee8907a4670e71348c00336dcf1cb5 | |
| parent | 7adcfe60b920cfac41fa8c393151ad67269987c6 (diff) | |
nslu2-image.bbclass: Remove the need for the temporary subdirectory by grabbing files from their original locations directly. Allow usage of this class in ixp4xx machines, not just nslu2.
| -rw-r--r-- | classes/nslu2-image.bbclass | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index edd23ae07f..33caa54b21 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -1,25 +1,23 @@ nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${STAGING_LOADER_DIR}/apex-nslu2.bin \ - ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-ixp4xx${SITEINFO_ENDIANESS} \ - ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2.bin \ - -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + slugimage -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -L ${STAGING_LOADER_DIR}/apex-nslu2.bin \ + -r Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin - slugimage -F -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2-16mb.bin \ - -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + slugimage -F -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -L ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \ + -r Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin - rm -rf ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb' -IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; " +EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb' +IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " |