dsmg600-image.bbclass, nas100d-image.bbclass, nslu2le.conf, nslu2be.conf: Added suppo...

diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass
index 6920fe5..5ccf492 100644 (file)
--- 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 0d48ebd..1150116 100644 (file)
--- 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 104bbdb..70df616 100644 (file)
--- 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 86c4ce7..be499b7 100644 (file)
--- 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"