From e317d36907e7ea15518b8c237d4b1ce797553c59 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 28 Nov 2007 03:45:42 +0000
Subject: 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.

---
 classes/nslu2-image.bbclass | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'classes')

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; "
-- 
cgit v1.2.3


From 22d8e49c3956522d7dba6e885c7ca04f06aea97c Mon Sep 17 00:00:00 2001
From: Cliff Brake <cbrake@bec-systems.com>
Date: Fri, 30 Nov 2007 13:54:20 +0000
Subject: base.bbclass: add buildall task from Poky Suggested by Richard as a
 way to force ipk's of dependencies to get build when building a package. 
 This is handy if your are building a package for a feed that does not get
 installed in an image.

---
 classes/base.bbclass | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'classes')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 06a49814d2..1794382699 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -508,6 +508,13 @@ base_do_fetchall() {
 	:
 }
 
+addtask buildall after do_build
+do_buildall[recrdeptask] = "do_build"
+base_do_buildall() {
+	:
+}
+
+
 def oe_unpack_file(file, data, url = None):
 	import bb, os
 	if not url:
-- 
cgit v1.2.3