From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Apr 2007 22:25:12 +0000 (+0000)
Subject: dsmg600-image.bbclass, nas100d-image.bbclass, nslu2le.conf, nslu2be.conf: Added suppo... 
X-Git-Tag: Release-2010-05/1~8868^2~742^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd59d6f7582d4ba5c7bce31ec46da02ee2d9c77f;p=openembedded.git

dsmg600-image.bbclass, nas100d-image.bbclass, nslu2le.conf, nslu2be.conf: Added support for building dsmg600 and nas100d images back into the nslu2 machine configuration.
---

diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass
index 6920fe5dbd..5ccf49267b 100644
--- a/classes/dsmg600-image.bbclass
+++ b/classes/dsmg600-image.bbclass
@@ -16,4 +16,5 @@ dsmg600_pack_image () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade
 }
 
-IMAGE_POSTPROCESS_COMMAND += "dsmg600_pack_image; "
+# dsmg600 is not a separate machine - use the nslu2 machine override.
+IMAGE_POSTPROCESS_COMMAND_nslu2 += "dsmg600_pack_image; "
diff --git a/classes/nas100d-image.bbclass b/classes/nas100d-image.bbclass
index 0d48ebd476..1150116bdb 100644
--- a/classes/nas100d-image.bbclass
+++ b/classes/nas100d-image.bbclass
@@ -16,4 +16,5 @@ nas100d_pack_image () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade
 }
 
-IMAGE_POSTPROCESS_COMMAND += "nas100d_pack_image; "
+# nas100d is not a separate machine - use the nslu2 machine override.
+IMAGE_POSTPROCESS_COMMAND_nslu2 += "nas100d_pack_image; "
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 104bbdb397..70df616d9a 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -16,4 +16,4 @@ require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
-INHERIT += "nslu2-image"
+INHERIT += "nslu2-image dsmg600-image nas100d-image"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 86c4ce7a31..be499b7020 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -16,4 +16,4 @@ require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
 
-INHERIT += "nslu2-image"
+INHERIT += "nslu2-image dsmg600-image nas100d-image"