[oe-commits] org.oe.dev h3600, h5000, hx4700: fix quoting of EXTRA_IMAGECMD

[koen commit]

h3600, h5000, hx4700: fix quoting of EXTRA_IMAGECMD

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6b3a4b7868d3ebe4f5c8cf504377475025fcaaed
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6b3a4b7868d3ebe4f5c8cf504377475025fcaaed
Files:
1
conf/machine/h3600.conf
conf/machine/h5000.conf
conf/machine/hx4700.conf
Diffs:

#
# mt diff -rd9e3217734b0c392bc59e7207ebeed7731679d0e -r6b3a4b7868d3ebe4f5c8cf504377475025fcaaed
#
# 
# 
# patch "conf/machine/h3600.conf"
#  from [5a90c0adbea0f5c4154d32bdd48143a5b8b28516]
#    to [31db8808f8c81cad80fc5c64790aff9715127565]
# 
# patch "conf/machine/h5000.conf"
#  from [2a1c7c17b1c601b18b3d16863669e65567be3921]
#    to [a924b03a44c7216d780fd8e3bdc2f2a0e538ece8]
# 
# patch "conf/machine/hx4700.conf"
#  from [77bfca65caf3b9294a5c598e6c6fb530be7375c3]
#    to [55e7b6a185418173ccaef6a6fa508acf61a85363]
# 
============================================================
--- conf/machine/h3600.conf	5a90c0adbea0f5c4154d32bdd48143a5b8b28516
+++ conf/machine/h3600.conf	31db8808f8c81cad80fc5c64790aff9715127565
@@ -30,12 +30,10 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
                              kernel-module-micro"
 
-EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
-EXTRA_IMAGECMD_h3600_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 
-
 # TODO: see if any of these modules have 2.6 counterparts
 # and need to be RRECOMMENDED
 #
============================================================
--- conf/machine/h5000.conf	2a1c7c17b1c601b18b3d16863669e65567be3921
+++ conf/machine/h5000.conf	a924b03a44c7216d780fd8e3bdc2f2a0e538ece8
@@ -20,8 +20,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
-EXTRA_IMAGECMD_h5000_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
============================================================
--- conf/machine/hx4700.conf	77bfca65caf3b9294a5c598e6c6fb530be7375c3
+++ conf/machine/hx4700.conf	55e7b6a185418173ccaef6a6fa508acf61a85363
@@ -39,13 +39,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
 				kernel-module-hx4700-acx \
 				kernel-module-snd-hx4700-audio"
 
-
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
 EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-			  -e 256KiB -p"
+			  -e 256KiB -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
-#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
-EXTRA_IMAGECMD_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 #
 # Modules autoload and other boot properties