Merge lp:~mwaddel/linaro-image-tools/vexpress-uInitrd-v2 into lp:linaro-image-tools/11.11

[Matt Waddel]

Adds the uInitrd to the SD/MMC deploy process. This version incorporates feedback from Loic's review.

[Loïc Minier (lool)]

This is ok

I appreciate the effort to quote one use of ${DIR}, obviously the other uses should be quoted as well.

I note you used:
"${DIR}"/disk/uInitrd

I usually write:
"$DIR/disk/uInitrd"
(i.e. use a single pair of double-quotes rather than multiple pairs; "$foo/$bar" rather than "$foo"/"$baz"; also don't use ${} if not needed)

and if you need wildcards, stop the quotes just before them, instead of:
${DIR}/binary/${parts_dir}/initrd.img-*-linaro-vexpress
use:
"$DIR/binary/$parts_dir/initrd.img-"*-linaro-vexpress
or:
"$DIR/binary/$parts_dir/initrd.img-"*"-linaro-vexpress"

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-08-31 20:57:05 +0000
+++ linaro-media-create	2010-08-31 23:28:41 +0000
@@ -215,8 +215,10 @@
      sudo tar --strip-components=5 -C ${DIR}/disk/ -xf $BINARY_TARBALL binary/usr/lib/u-boot/ca9x4_ct_vxp/u-boot.bin
      sudo mkimage -A arm -O linux -T kernel -C none -a 0x60008000 -e 0x60008000 \
           -n "Linux" -d ${DIR}/binary/${parts_dir}/vmlinuz*-vexpress ${DIR}/disk/uImage
-     # TODO add uInitrd once we have daily images
-     #sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.vexpress ${DIR}/disk/uInitrd
+     sudo mkimage -A arm -O linux -T ramdisk -C none -a 0x81000000 \
+          -e 0x81000000 -n "initramfs" -d \
+          ${DIR}/binary/${parts_dir}/initrd.img-*-linaro-vexpress \
+          "${DIR}"/disk/uInitrd
      ;;
    *)
      echo "Set --dev parameter: --dev <beagle|vexpress>" 1>&2