[oe-commits] org.oe.dev merge of '02c65976b427810565e51bb9c833661ff51fbd96'

[rwhitby commit]

merge of '02c65976b427810565e51bb9c833661ff51fbd96'
     and '52a3418d782cb7fcc2581f5041a10b2044d0db76'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: f3f7bae5d2c6ed92a3c654cac5ab93877664a736
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f3f7bae5d2c6ed92a3c654cac5ab93877664a736
Files:
1
classes/dsmg600-image.bbclass
classes/nas100d-image.bbclass
Diffs:

#
# mt diff -r02c65976b427810565e51bb9c833661ff51fbd96 -rf3f7bae5d2c6ed92a3c654cac5ab93877664a736
#
# 
# no changes
# 


#
# mt diff -r52a3418d782cb7fcc2581f5041a10b2044d0db76 -rf3f7bae5d2c6ed92a3c654cac5ab93877664a736
#
# 
# 
# patch "classes/dsmg600-image.bbclass"
#  from [57e49d826faa211e7dc4c731787ceb5964cef0a9]
#    to [fafa2c513c4246d7be56965ed9c7e91146eb7c90]
# 
# patch "classes/nas100d-image.bbclass"
#  from [8864cf4e333d9cc26bc3758832ae37567a260aab]
#    to [ceeb93bee17085e0ed07e4b1b7f88f936af4cbb3]
# 
============================================================
--- classes/dsmg600-image.bbclass	57e49d826faa211e7dc4c731787ceb5964cef0a9
+++ classes/dsmg600-image.bbclass	fafa2c513c4246d7be56965ed9c7e91146eb7c90
@@ -16,4 +16,5 @@ dsmg600_pack_image () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade
 }
 
+# dsmg600 is not a separate machine - use the nslu2 machine override.
+IMAGE_POSTPROCESS_COMMAND_nslu2 += "dsmg600_pack_image; "
-IMAGE_POSTPROCESS_COMMAND += "dsmg600_pack_image; "
============================================================
--- classes/nas100d-image.bbclass	8864cf4e333d9cc26bc3758832ae37567a260aab
+++ classes/nas100d-image.bbclass	ceeb93bee17085e0ed07e4b1b7f88f936af4cbb3
@@ -16,4 +16,5 @@ nas100d_pack_image () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade
 }
 
+# nas100d is not a separate machine - use the nslu2 machine override.
+IMAGE_POSTPROCESS_COMMAND_nslu2 += "nas100d_pack_image; "
-IMAGE_POSTPROCESS_COMMAND += "nas100d_pack_image; "