summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-04-08 11:06:26 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-04-08 11:06:26 +0000
commit6467c17ee3ed1fc4172b7097866cbfda0d121b54 (patch)
treebfd75595c02e136751b1b1fd63c5658a82b26bef /classes
parentab558e457be74f9cfac93e8404fdc72f70f967b0 (diff)
parent1fdf9fe3c7fc8a1e2b00bd41c1992649c0f3b831 (diff)
merge of '1a8e31d2ffcaca539ade0baec8dbd6a927d9c466'
and '7dbda2b624d08e5fc6f9dfea51525e3fe8b4196c'
Diffstat (limited to 'classes')
-rw-r--r--classes/dsmg600-image.bbclass3
-rw-r--r--classes/nas100d-image.bbclass3
2 files changed, 4 insertions, 2 deletions
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; "