Merge lp:~mwaddel/linaro-image-tools/split-deploy-v3 into lp:linaro-image-tools/11.11

[Matt Waddel]

Added code review corrections from Loic to branch:

https://code.launchpad.net/~mwaddel/linaro-image-tools/split-deploy-v2

[Loïc Minier (lool)]

See also earlier review https://code.launchpad.net/~mwaddel/linaro-image-tools/split-deploy-v2/+merge/38760

[Loïc Minier (lool)]

Looks good to me, except for a typo in the comment in r153: s/devives/devices/

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-10-13 21:57:24 +0000
+++ linaro-media-create	2010-10-19 02:49:41 +0000
@@ -19,8 +19,8 @@
 
 set -e
 
-unset MMC MMC1 MMC2 MMC3 IMAGE_FILE HWPACK_FILE UBOOT_FLAVOR KERNEL_ADDR
-unset INITRD_ADDR CREATE_SWAP SWAP_SIZE
+unset DEVICE BOOTFS ROOTFS IMAGE_FILE HWPACK_FILE UBOOT_FLAVOR KERNEL_ADDR
+unset INITRD_ADDR CREATE_SWAP SWAP_SIZE DEPLOY_STEPS
 
 #Defaults
 RFS=ext3
@@ -31,6 +31,9 @@
 FAT_SIZE=32
 IMAGE_SIZE=2G
 MMC_PART_OFFSET=0
+BOOTFS_STEP="create_boot_cmd populate_boot"
+ROOTFS_STEP="populate_rootfs"
+PARTITION_STEP="create_partitions"
 
 DIR=$PWD
 TMP_DIR=$(mktemp -d)
@@ -55,7 +58,7 @@
 
 required options:
 --mmc </dev/sdX>
-    Unformated MMC Card
+    Unformatted Storage Device
 <or>
 --image_file <xxx>
     specify name of image file
@@ -108,14 +111,23 @@
 
 --binary <filename>
     specify file used to create the bootable system. Default binary-tar.tar.gz
+
+--no-rootfs
+    do not deploy the root filesystem
+
+--no-bootfs
+    do not deploy the boot filesystem
+
+--no-part
+    reuse existing partitions on the deploy media
 EOF
   exit
 }
 
-check_mmc() {
-  FDISK=$(sudo LC_ALL=C sfdisk -l | grep "[Disk] ${MMC}" | awk '{print $2}')
+check_device() {
+  FDISK=$(sudo LC_ALL=C sfdisk -l | grep "[Disk] ${DEVICE}" | awk '{print $2}')
 
-  if test "-$FDISK-" = "-$MMC:-"
+  if test "-$FDISK-" = "-$DEVICE:-"
   then
     echo ""
     echo "I see..."
@@ -125,12 +137,12 @@
     echo "mount:"
     LC_ALL=C mount | grep -v none | grep "/dev/" --color=never
     echo ""
-    read -p "Are you 100% sure, on selecting [${MMC}] (y/n)? "
+    read -p "Are you 100% sure, on selecting [${DEVICE}] (y/n)? "
     [ "$REPLY" == "y" ] || exit
     echo ""
   else
     echo ""
-    echo "Are you sure? I Don't see [${MMC}], here is what I do see..."
+    echo "Are you sure? I Don't see [${DEVICE}], here is what I do see..."
     echo ""
     echo "sudo sfdisk -l:"
     sudo LC_ALL=C sfdisk -l | grep "[Disk] /dev/" --color=never
@@ -176,8 +188,8 @@
       ;;
     --mmc)
       checkparm "$2"
-      MMC="$2"
-      check_mmc
+      DEVICE="$2"
+      check_device
       ;;
     --image_file)
       checkparm "$2"
@@ -224,10 +236,21 @@
       checkparm "$2"
       BINARY_TARBALL="$2"
       ;;
+    --no-rootfs)
+      ROOTFS_STEP=""
+      ;;
+    --no-bootfs)
+      BOOTFS_STEP=""
+      ;;
+    --no-part)
+      PARTITION_STEP=""
+      ;;
   esac
   shift
 done
 
+DEPLOY_STEPS="$PARTITION_STEP prepare_partitions $BOOTFS_STEP $ROOTFS_STEP"
+
 ensure_command mkimage uboot-mkimage
 ensure_command uuidgen uuid-runtime
 ensure_command parted parted
@@ -254,13 +277,13 @@
 
 RFS_UUID=`uuidgen -r`
 
-get_mmcs_by_id() {
+get_device_by_id() {
   if [ ! "${IMAGE_FILE}" ]; then
     for device in /dev/disk/by-id/*; do
-      if [ `realpath $device` = $MMC ]; then
+      if [ `realpath $device` = $DEVICE ]; then
         case "$device" in
           *-part[0-9]*)
-            echo "device $MMC must not be a partition part ($device)" >&2
+            echo "device $DEVICE must not be a partition part ($device)" >&2
             exit 1
           ;;
         esac
@@ -270,11 +293,9 @@
           # echo "part $part_no found: $part_id" 1>&2
           # if there is a non-fs-data part (e.g. mx51evk), MMC_PART_OFFSET=1
           if test "$part_no" = $((1 + $MMC_PART_OFFSET)); then
-            MMC1=$part
+            BOOTFS=$part
           elif test "$part_no" = $((2 + $MMC_PART_OFFSET)) ; then
-            MMC2=$part
-          elif test "$part_no" = $((3 + $MMC_PART_OFFSET)); then
-            MMC3=$part
+            ROOTFS=$part
           fi
         done
         break
@@ -367,22 +388,23 @@
   echo "Umounting Partitions"
   echo ""
 
-  if test -n "$MMC1"; then
-    sudo umount ${MMC1} &> /dev/null || true
-  fi
-  if test -n "$MMC2"; then
-    sudo umount ${MMC2} &> /dev/null || true
-  fi
-  if [ "${MMC}" ]; then
-    sudo parted -s ${MMC} mklabel msdos
+  if test -n "$BOOTFS"; then
+    sudo umount ${BOOTFS} &> /dev/null || true
+  fi
+  if test -n "$ROOTFS"; then
+    sudo umount ${ROOTFS} &> /dev/null || true
   fi
 }
 
 create_partitions() {
+  if [ "${DEVICE}" ]; then
+    sudo parted -s ${DEVICE} mklabel msdos
+  fi
+
   if [ "${IMAGE_FILE}" ]; then
     partdev=${IMAGE_FILE}
   else
-    partdev=${MMC}
+    partdev=${DEVICE}
   fi
 
   if [ "$FAT_SIZE" = "32" ]; then
@@ -419,23 +441,43 @@
   ROOTSIZE2=$(($(LC_ALL=C fdisk -l -u "$IMAGE_FILE" | grep Linux | awk '{print $3}')))
   ROOTSIZE1=$(($(LC_ALL=C fdisk -l -u "$IMAGE_FILE" | grep Linux | awk '{print $2}')))
   ROOTSIZE=$((((ROOTSIZE2+1-ROOTSIZE1)/2)*1024))
-  MMC1=$(sudo losetup -f --show "$IMAGE_FILE" --offset $VFATOFFSET --sizelimit $VFATSIZE)
-  MMC2=$(sudo losetup -f --show "$IMAGE_FILE" --offset $ROOTOFFSET --sizelimit $ROOTSIZE)
+  BOOTFS=$(sudo losetup -f --show "$IMAGE_FILE" --offset $VFATOFFSET --sizelimit $VFATSIZE)
+  ROOTFS=$(sudo losetup -f --show "$IMAGE_FILE" --offset $ROOTOFFSET --sizelimit $ROOTSIZE)
   fi
 }
 
 
 prepare_partitions() {
+
+echo -n "waiting for partitioning to settle ..."
+sync
+sleep 3
+echo "done."
+get_device_by_id
+
+if [ "$BOOTFS_STEP" ]; then
   echo ""
   echo "Formating Boot Partition"
   echo ""
-
-  sudo mkfs.vfat -F ${FAT_SIZE} ${MMC1} -n ${BOOT_LABEL}
-
+  if [ -z "$BOOTFS" ]; then
+    echo "Partition $BOOTFS does not exist"
+    exit 2
+  else
+    sudo mkfs.vfat -F ${FAT_SIZE} ${BOOTFS} -n ${BOOT_LABEL}
+  fi
+fi
+
+if [ "$ROOTFS_STEP" ]; then
   echo ""
   echo "Formating ${RFS} Partition"
   echo ""
-  sudo mkfs.${RFS} -U "$RFS_UUID" ${MMC2} -L ${RFS_LABEL}
+  if [ -z "$ROOTFS" ]; then
+    echo "Partition $ROOTFS does not exist"
+    exit 2
+  else
+    sudo mkfs.${RFS} -U "$RFS_UUID" ${ROOTFS} -L ${RFS_LABEL}
+  fi
+fi
 }
 
 populate_boot() {
@@ -454,7 +496,7 @@
   fi
  
   mkdir -p "${BOOT_DISK}"
-  sudo mount ${MMC1} "${BOOT_DISK}"
+  sudo mount ${BOOTFS} "${BOOT_DISK}"
 
   if [ -n "$UBOOT_FLAVOR" ]; then
       sudo cp -v "binary/usr/lib/u-boot/${UBOOT_FLAVOR}/u-boot.bin" \
@@ -526,7 +568,7 @@
   echo "Be patient, this may take a few minutes"
   echo ""
   mkdir -p "${ROOT_DISK}"
-  sudo mount ${MMC2} "${ROOT_DISK}"
+  sudo mount ${ROOTFS} "${ROOT_DISK}"
 
   sudo mv ${DIR}/binary/* "$ROOT_DISK"
 
@@ -539,7 +581,7 @@
     echo "Creating SWAP File"
     echo ""
 
-    SPACE_LEFT=$(LC_ALL=C df "${ROOT_DISK}" | grep ${MMC2} | awk '{print $4}')
+    SPACE_LEFT=$(LC_ALL=C df "${ROOT_DISK}" | grep ${ROOTFS} | awk '{print $4}')
 
     let SIZE=$SWAP_SIZE*1024
 
@@ -675,31 +717,30 @@
 TARGET_BOOT_DEV=/dev/mmcblk0p$(( 1 + $MMC_PART_OFFSET ))
 TARGET_ROOT_DEV=/dev/mmcblk0p$(( 2 + $MMC_PART_OFFSET ))
 
-if [ ! "${MMC}" -a ! "${IMAGE_FILE}" ]; then
+if [ ! "${DEVICE}" -a ! "${IMAGE_FILE}" ]; then
   usage
 fi
 
+# The bootfs and rootfs deploy options are only available with physical 
+# devives.  These options are intended for deploying to different devices like
+# a USB drive and an MMC device.  The options do not apply to qemu image_files.
+if [ "${IMAGE_FILE}" ]; then
+  if [ -z "${ROOTFS_STEP}" ] || [ -z "${BOOTFS_STEP}" ]; then
+    echo "Do not use --no-rootfs or --no-bootfs with the --image_file option"
+    exit
+  fi
+fi
+
 unpack_binary_tarball
 if [ "$HWPACK_FILE" ]; then
   install_hwpack
 else
   echo "Warning, --hwpack <filename> was not specified, the result is unlikely to be functional without manual effort to setup uImage, MLO, u-boot.bin and so as as appropriate for your hardware."
 fi
-create_boot_cmd
-get_mmcs_by_id
+get_device_by_id
 cleanup_sd
-create_partitions
-echo -n "waiting for partitioning to settle ..."
-sync
-sleep 3
-echo "done."
-get_mmcs_by_id
-if test -z "$MMC1" -o -z "$MMC2"; then
-  echo "MMC1: $MMC1 nor MMC2: $MMC2 must be empty"
-  exit 2
-fi
-prepare_partitions
-populate_boot
-populate_rootfs
+for func in $DEPLOY_STEPS; do
+  $func
+done
 remove_binary_dir