xf86-video-omapfb: pandora: handle cycle/forcer events better

[openembedded.git] / classes / nslu2-image.bbclass

diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass
index 14bf989..8be1fa7 100644 (file)
--- a/classes/nslu2-image.bbclass
+++ b/classes/nslu2-image.bbclass
@@ -1,20 +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 \
-                       ${DEPLOY_DIR_IMAGE}/slug/
-       install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${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 \
-               -r Ramdisk:1,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
-       rm -rf ${DEPLOY_DIR_IMAGE}/slug
+       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
 }
 
-EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native'
-IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; "
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe apex-nslu2 apex-nslu2-16mb'
+IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "