Merge lp:~dpigott/lava-master-image-scripts/deployment-improvements into lp:lava-master-image-scripts

[Dave Pigott]

Add patch to apply fix for panda streaming bug on first boot

Make reference to rootfs and hwpack only have to be set once

Changes to lava-partition-disk use board type to set number of partitions, and to add preEnv.txt to TI boards so that bootdelay is set

Update documentation on new lava-partition-disk

[Zygmunt Krynicki (zyga)]

Lots of changes, good stuff, two comments:

0) Bzr workflow is sucky verbose, meh

1) The fix for panda is wrong, the first boot will still experience all the issues that line prevents. After changing sysctl config reload it (I don't recall the command not but it's probably sysctl -p

2) Can we move the partition step to happen at first boot please? It should be easily doable now. I know it's a lot to ask for so this can go in (noting that 1) needs to be fixed).

[Dave Pigott (dpigott)]

1) Sort of - we always reboot before doing anything, so the fix gets loaded
2) Completely agree. It's doable and I shall do it. :)

[Michael Hudson-Doyle (mwhudson)]

I think I agree with Zygmunt that having a sysctl -p would be a bit cleaner although it's not really necessary. Doing the partitioning at first boot would be awesome but that can be in another branch :-)

WRT the streaming errors, it feels like we're stepping around a kernel bug really. Have we talked to any kernel people about it?

Anyway, add sysctl -p and merge please!

review: Approve

[Spring Zhang (qzhang)]

134 +case $1 in
135 + beagle)
136 + PRE_ENV=Y
137 + SCHEME=2part;;
138 +
139 + imx53)
140 + SCHEME=3part;;
141 +
142 + origen)
143 + SCHEME=3part;;
144 +
145 + panda)
146 + PRE_ENV=Y
147 + SCHEME=2part;;
148 +
149 + snowball)
150 + SCHEME=2part;;
151 +
152 + vexpress)
153 + SCHEME=2part;;

You can use:
imx53|origen)
SCHEME=3part;;
snowball|vexpress)
SCHEME=2part;;
beagle|panda)
PRE_ENV=Y
SCHEME=2part;;

to decrease duplication.

[Dave Pigott (dpigott)]

Spring: I tend to not like doing that, because at some point we may well want to add some more board specific stuff and then we end up having to split them anyway.

[lp:~dpigott/lava-master-image-scripts/deployment-improvements]

57. By Dave Pigott on 2012-05-14

Add sysctl refresh after load

=== modified file 'README'
--- README	2012-03-22 09:47:48 +0000
+++ README	2012-05-14 07:10:24 +0000
@@ -36,12 +36,18 @@
 LAVA dispatcher. To finish the process copy the image to an SD card as instructed
 by the tool and run:
 
-    $ ./contrib/lava-partition-disk <device path>
+    $ ./contrib/lava-partition-disk <board type> <device path> <boot mount>
+
+Replace <board type> with one of: beagle, imx53, origen, panda, snowball
+or vexpress.
 
 Replace <device path> with the name of the system device that represents your
 SD card, typically this is /dev/sdX or /dev/mmcblkX (with X being a number or
 letter representing subsequent devices in your system).
 
+Replace <boot mount> with the mount point for the boot partition, typically on
+Ubuntu this will be /media/boot.
+
 This step will be integrated into the tool in the future. At this time the card
 is now ready and can be cloned (like a template). The first boot of a device
 with this card is special. It will initialize the master image and will likely

=== modified file 'boards.d/beagle.conf'
--- boards.d/beagle.conf	2012-03-22 09:53:58 +0000
+++ boards.d/beagle.conf	2012-05-14 07:10:24 +0000
@@ -8,7 +8,7 @@
 ROOTFS_PARTITION=2
 # Hardware Pack
 HWPACK=hwpack_linaro-omap3_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-omap3_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=b979df84e892d7112cc5b3feb96d9a8c
 # Device name for linaro-media-create
 LMC_DEV=beagle

=== modified file 'boards.d/imx53.conf'
--- boards.d/imx53.conf	2012-03-22 09:53:58 +0000
+++ boards.d/imx53.conf	2012-05-14 07:10:24 +0000
@@ -11,7 +11,7 @@
 ROOTFS_PARTITION=3
 # Hardware Pack
 HWPACK=hwpack_linaro-lt-mx5_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-lt-mx5_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=e074159ae4e453dab027a6faed2a0af3
 # Device name for linaro-media-create
 LMC_DEV=mx53loco

=== modified file 'boards.d/origen.conf'
--- boards.d/origen.conf	2012-03-22 09:53:58 +0000
+++ boards.d/origen.conf	2012-05-14 07:10:24 +0000
@@ -8,7 +8,7 @@
 ROOTFS_PARTITION=3
 # Hardware Pack
 HWPACK=hwpack_linaro-leb-origen_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-leb-origen_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=c3a3e23d5abf7d3913d9378466b91ee0
 # Device name for linaro-media-create
 LMC_DEV=origen

=== modified file 'boards.d/panda.conf'
--- boards.d/panda.conf	2012-03-22 09:53:58 +0000
+++ boards.d/panda.conf	2012-05-14 07:10:24 +0000
@@ -8,7 +8,7 @@
 ROOTFS_PARTITION=2
 # Hardware Pack
 HWPACK=hwpack_linaro-lt-panda_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-lt-panda_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=67da422b8ed81b6dba80fd57882d3ac0
 # Device name for linaro-media-create
 LMC_DEV=panda

=== modified file 'boards.d/snowball.conf'
--- boards.d/snowball.conf	2012-03-21 16:49:37 +0000
+++ boards.d/snowball.conf	2012-05-14 07:10:24 +0000
@@ -8,7 +8,7 @@
 ROOTFS_PARTITION=2
 # Hardware Pack
 HWPACK=hwpack_linaro-lt-snowball_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-lt-snowball_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=f392883d5ab4df726ed5e2e308afd68a
 # Device name for linaro-media-create
 LMC_DEV=snowball_sd

=== modified file 'boards.d/vexpress.conf'
--- boards.d/vexpress.conf	2012-03-22 15:01:10 +0000
+++ boards.d/vexpress.conf	2012-05-14 07:10:24 +0000
@@ -8,7 +8,7 @@
 ROOTFS_PARTITION=2
 # Hardware Pack
 HWPACK=hwpack_linaro-lt-vexpress-a9_20120221-1_armel_supported.tar.gz
-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/hwpack_linaro-lt-vexpress-a9_20120221-1_armel_supported.tar.gz
+HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
 HWPACK_MD5=3c5562d100c669b6bc951f8565fe1988
 # Device name for linaro-media-create
 LMC_DEV=vexpress-a9

=== modified file 'contrib/lava-partition-disk'
--- contrib/lava-partition-disk	2012-04-18 22:32:26 +0000
+++ contrib/lava-partition-disk	2012-05-14 07:10:24 +0000
@@ -1,31 +1,77 @@
 #!/bin/bash
 
-if [ "$1" = "" ]
+show_usage() {
+    echo "Usage: $0 <board type> <device path> <boot mount> {testrootfs partition size}"
+    echo "Where <board typei> is one of: beagle, imx53, origen, panda,"
+    echo "  snowball or vexpress"
+    echo
+    echo "<device path> is the path to your sd card (e.g. /dev/sdb)"
+    echo "<boot mount> is where the boot partition of the sd card is (e.g. /media/boot"
+    echo
+    echo "The testrootfs partition size is optional and defauts to 4G."
+    echo "Make sure you specify the \"G\" in uppercase"
+}
+
+if [ "$3" = "" ]
 then
-    echo "Usage: $0 DEVICE"
+    show_usage
     exit 1
-else
-    DEVICE=$1
 fi
 
-if [ "$2" = "" ]
+PRE_ENV=
+
+case $1 in
+    beagle)
+        PRE_ENV=Y
+        SCHEME=2part;;
+
+    imx53)
+        SCHEME=3part;;
+
+    origen)
+        SCHEME=3part;;
+
+    panda)
+        PRE_ENV=Y
+        SCHEME=2part;;
+
+    snowball)
+        SCHEME=2part;;
+
+    vexpress)
+        SCHEME=2part;;
+
+    *)
+        echo "Board type \"$1\" not recognised"
+        exit 1;;
+esac
+
+DEVICE=$2
+
+BOOT_MOUNT=$3
+
+if [ "$4" = "" ]
 then
     # SIZE is the size of the testrootfs partition. On an 8G sd you can fit
     # 4G - put it up to 8G on a 16GB. The rest is allocated to sdcard for
     # android
     SIZE="4G"
 else
-    SIZE=$2
+    SIZE=$4
 fi
 
-if [ "$3" = "" ]
+if [ "$PRE_ENV" = "Y" ]
 then
-    SCHEME="2part"
-else
-    SCHEME=$3
+    cp ./contrib/preEnv.txt $BOOT_MOUNT
+    if [ "$?" != "0" ]
+    then
+        echo "Failed to copy preEnv.txt. Is the disk read only?"
+        exit 1
+    fi
 fi
 
-# origen has a different original layout with 3 partitions - all others are the same (so far)
+# origen and imx53 have a different original layout with 3 partitions
+# all others are the same (so far)
 
 if [ $SCHEME = "2part" ]
 then

=== added file 'contrib/preEnv.txt'
--- contrib/preEnv.txt	1970-01-01 00:00:00 +0000
+++ contrib/preEnv.txt	2012-05-14 07:10:24 +0000
@@ -0,0 +1,1 @@
+bootdelay=10

=== modified file 'lava-create-master'
--- lava-create-master	2012-05-04 11:42:33 +0000
+++ lava-create-master	2012-05-14 07:10:24 +0000
@@ -7,7 +7,7 @@
 
 # Common root filesystem that is the base for all boards 
 COMMON_ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
-COMMON_ROOTFS_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/linaro-o-nano-tar-20120221-0.tar.gz
+COMMON_ROOTFS_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$COMMON_ROOTFS
 COMMON_ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
 
 # When non-empty the tool is verbose

=== modified file 'master-rootfs-extras/lib/lava/lava-master-init'
--- master-rootfs-extras/lib/lava/lava-master-init	2012-03-22 17:46:56 +0000
+++ master-rootfs-extras/lib/lava/lava-master-init	2012-05-14 07:10:24 +0000
@@ -16,6 +16,7 @@
 # Set of packages to install on first boot
 LAVA_PKGS="wget dosfstools u-boot-tools bzip2 python ntpdate"
 
+DEVICE_TYPE=`lava-device-info --device-type`
 
 # First boot startup function
 # 1) Initializes APT
@@ -53,6 +54,11 @@
         echo "Unable to synchronize time" >&2
         return 1
     fi
+    if [ "$DEVICE_TYPE" = "lava:panda" ]; then
+        echo "Applying sysctl fix for streaming errors on Panda" >> "$LAVA_FIRST_BOOT_LOG"
+        echo vm.min_free_kbytes = 32768 >> /etc/sysctl.conf
+        sysctl -p
+    fi
     # Generate LAVA first-boot UUID
     echo "Generating first-boot UUID" >> "$LAVA_FIRST_BOOT_LOG"
     LAVA_FIRST_BOOT_UUID="$(python -c 'import uuid; print uuid.uuid1()')"