[oe-commits] org.oe.dev 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.

[rwhitby commit]

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.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5d961d38f1577e9f033239ae0ebf624b3caf50e9
ViewMTN: http://monotone.openembedded.org/revision/info/5d961d38f1577e9f033239ae0ebf624b3caf50e9
Files:
1
classes/nslu2-image.bbclass
Diffs:

#
# mt diff -r840894a6fd0c584ae792bdf084eff0df5d5d67f5 -r5d961d38f1577e9f033239ae0ebf624b3caf50e9
#
# 
# 
# patch "classes/nslu2-image.bbclass"
#  from [a75b47c6e523125efc0f292c13f24e2059a58125]
#    to [3ba57cc877ce3060583122672952bf4a937be2d7]
# 
============================================================
--- classes/nslu2-image.bbclass	a75b47c6e523125efc0f292c13f24e2059a58125
+++ classes/nslu2-image.bbclass	3ba57cc877ce3060583122672952bf4a937be2d7
@@ -1,25 +1,23 @@ nslu2_pack_image () {
 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 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
+IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "
-EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
-IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; "