[oe-commits] org.oe.dev dsmg600-image.bbclass, nas100d-image.bbclass, nslu2le.conf, nslu2be.conf: Added support for building dsmg600 and nas100d images back into the nslu2 machine configuration.

[rwhitby commit]

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

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

#
# mt diff -r9326c45bf734f0f64666b2f374287570c0154243 -r90aaff6867593ad57780012731d24b39abf8c34d
#
# 
# 
# patch "classes/dsmg600-image.bbclass"
#  from [57e49d826faa211e7dc4c731787ceb5964cef0a9]
#    to [fafa2c513c4246d7be56965ed9c7e91146eb7c90]
# 
# patch "classes/nas100d-image.bbclass"
#  from [8864cf4e333d9cc26bc3758832ae37567a260aab]
#    to [ceeb93bee17085e0ed07e4b1b7f88f936af4cbb3]
# 
# patch "conf/machine/nslu2be.conf"
#  from [cff57921aaf972f90ca5867aad329dcc929545ef]
#    to [e2a31ba10aa6f0ffff1a2cc5bccb57e77fed5113]
# 
# patch "conf/machine/nslu2le.conf"
#  from [9f32cb71bbe6140f67e63456f9ef267bec89ff7a]
#    to [211de25bd0f525c4d6a9f631fb72f828420e2b90]
# 
============================================================
--- 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; "
============================================================
--- conf/machine/nslu2be.conf	cff57921aaf972f90ca5867aad329dcc929545ef
+++ conf/machine/nslu2be.conf	e2a31ba10aa6f0ffff1a2cc5bccb57e77fed5113
@@ -16,4 +16,4 @@ EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
+INHERIT += "nslu2-image dsmg600-image nas100d-image"
-INHERIT += "nslu2-image"
============================================================
--- conf/machine/nslu2le.conf	9f32cb71bbe6140f67e63456f9ef267bec89ff7a
+++ conf/machine/nslu2le.conf	211de25bd0f525c4d6a9f631fb72f828420e2b90
@@ -16,4 +16,4 @@ EXTRA_IMAGECMD_jffs2 += "--little-endian
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
 
+INHERIT += "nslu2-image dsmg600-image nas100d-image"
-INHERIT += "nslu2-image"