Merge lp:~jcrigby/linaro-image-tools/unified-image-device-partitioning into lp:linaro-image-tools/11.11

[John Rigby]

use same tool (sfdisk) for partitioning devices and imagefiles
this fixes the problem of fdisk prompting differently for some devices and is also more consistent

[Loïc Minier (lool)]

Looks good from quick reading

review: Approve

[lp:~jcrigby/linaro-image-tools/unified-image-device-partitioning]

28. By John Rigby on 2010-08-05

Create /etc/flash-kernel.conf so flash-kernel works

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-07-01 17:12:07 +0000
+++ linaro-media-create	2010-08-05 15:15:57 +0000
@@ -123,39 +123,20 @@
  fi
 }
 
-function create_partitions_mmc {
-
-sudo fdisk -H 255 -S 63 ${MMC} << END
-n
-p
-1
-1
-+64M
-a
-1
-t
-e
-
-
-n
-p
-2
-
-
-p
-w
-END
-
-}
-
-function create_partitions_image {
+function create_partitions {
+if [ "${IMAGE_FILE}" ]; then
+partdev=${IMAGE_FILE}
+else
+partdev=${MMC}
+fi
 # Create a VFAT partition of 9 cylinders which is about 64M
 # and a linux partition of the rest
-sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $IMAGE_FILE << 'THEEND'
+sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $partdev << 'THEEND'
 ,9,0x0C,*
 ,,,-
 THEEND
 
+if [ "${IMAGE_FILE}" ]; then
 VFATOFFSET=$(($(fdisk -l -u $IMAGE_FILE | grep FAT | awk '{print $3}')*512))
 VFATSIZE=$(($(fdisk -l -u $IMAGE_FILE | grep FAT | awk '{print $5}')*1024))
 ROOTOFFSET=$(($(fdisk -l -u $IMAGE_FILE | grep Linux | awk '{print $2}')*512))
@@ -164,16 +145,10 @@
 ROOTSIZE=$((((ROOTSIZE2-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)
-}
-
-function create_partitions {
-if [ "${IMAGE_FILE}" ]; then
-  create_partitions_image
-else
-  create_partitions_mmc
 fi
 }
 
+
 function prepare_partitions {
 
 echo ""
@@ -270,6 +245,12 @@
   fi
  fi
 
+ echo ""
+ echo "Creating /etc/flash-kernel.conf"
+ echo ""
+
+ echo "UBOOT_PART=/dev/mmcblk0p1" > ${DIR}/disk/etc/flash-kernel.conf
+
  cd ${DIR}/disk/
  sync
  sync
@@ -348,17 +329,23 @@
     IMAGE_SIZE=$(($IMAGE_SIZE))
 }
 
-function setup_image {
-    calculatesize
+function setup_sizes {
     HEADS=255
     SECTORS=63
     SECTORSIZE=512
+    if [ "${IMAGE_FILE}" ]; then
+    calculatesize
     CYLINDERSIZE=$(($HEADS*$SECTORS*$SECTORSIZE))
     CYLINDERS=$(($IMAGE_SIZE/$CYLINDERSIZE))
     CYLINDER_ARG="-C $CYLINDERS"
     IMAGE_SIZE=$(($CYLINDERS*$CYLINDERSIZE))
+    else
+    CYLINDER_ARG=""
+    fi
+}
+
+function setup_image {
     FAT_SIZE=32
-
     sudo qemu-img create -f raw $IMAGE_FILE $IMAGE_SIZE
 }
 
@@ -498,6 +485,7 @@
     shift
 done
 
+setup_sizes
 if [ "${IMAGE_FILE}" ]; then
   setup_image
 fi