Merge lp:~dpigott/lava-master-image-scripts/update-panda-to-13-06 into lp:lava-master-image-scripts

Proposed by Dave Pigott
Status: Merged
Approved by: Dave Pigott
Approved revision: 80
Merged at revision: 79
Proposed branch: lp:~dpigott/lava-master-image-scripts/update-panda-to-13-06
Merge into: lp:lava-master-image-scripts
Diff against target: 37 lines (+7/-6)
2 files modified
boards.d/panda.conf (+6/-6)
master-rootfs-extras/lib/lava/lava-master-init (+1/-0)
To merge this branch: bzr merge lp:~dpigott/lava-master-image-scripts/update-panda-to-13-06
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+173037@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'boards.d/panda.conf'
--- boards.d/panda.conf 2013-04-17 13:00:29 +0000
+++ boards.d/panda.conf 2013-07-04 15:11:40 +0000
@@ -1,15 +1,15 @@
1# vim: syntax=sh1# vim: syntax=sh
2DESC="TI Panda Board (43xx and 46xx)"2DESC="TI Panda Board (43xx and 46xx)"
3# Root File System3# Root File System
4ROOTFS=$COMMON_ROOTFS4ROOTFS=linaro-raring-nano-20130623-410.tar.gz
5ROOTFS_URL=$COMMON_ROOTFS_URL5ROOTFS_URL=http://releases.linaro.org/13.06/ubuntu/raring-images/nano/$ROOTFS
6ROOTFS_MD5=$COMMON_ROOTFS_MD56ROOTFS_MD5=7d4cc6fbbc4a1d9214eb6d105e290bce
7# Root filesystem partition number as created by linaro-media-create7# Root filesystem partition number as created by linaro-media-create
8ROOTFS_PARTITION=28ROOTFS_PARTITION=2
9# Hardware Pack9# Hardware Pack
10HWPACK=hwpack_linaro-panda_20130328-278_armhf_supported.tar.gz10HWPACK=hwpack_linaro-panda_20130623-376_armhf_supported.tar.gz
11HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/panda/$HWPACK11HWPACK_URL=http://releases.linaro.org/13.06/ubuntu/panda/$HWPACK
12HWPACK_MD5=0c7baf3de1f9562a5ce1d1ff7fd9788612HWPACK_MD5=10488a9f7b1246bc9291c4156bf0f686
13# Device name for linaro-media-create13# Device name for linaro-media-create
14LMC_DEV=panda14LMC_DEV=panda
15# Device name for LAVA15# Device name for LAVA
1616
=== modified file 'master-rootfs-extras/lib/lava/lava-master-init'
--- master-rootfs-extras/lib/lava/lava-master-init 2013-07-04 11:34:29 +0000
+++ master-rootfs-extras/lib/lava/lava-master-init 2013-07-04 15:11:40 +0000
@@ -57,6 +57,7 @@
57 return 157 return 1
58 fi58 fi
59 echo "stty columns 10000" >> /etc/profile59 echo "stty columns 10000" >> /etc/profile
60 echo "export FLASH_KERNEL_SKIP=1" >> /etc/profile
60 # Do disk partitioning61 # Do disk partitioning
61 echo "Partitioning disk to LAVA format" >> "$LAVA_FIRST_BOOT_LOG"62 echo "Partitioning disk to LAVA format" >> "$LAVA_FIRST_BOOT_LOG"
62 if ! lava-partition-disk -r $LAVA_ROOTFS_SIZE -u $LAVA_USERDATA_SIZE>> "$LAVA_FIRST_BOOT_LOG" 2>&1; then63 if ! lava-partition-disk -r $LAVA_ROOTFS_SIZE -u $LAVA_USERDATA_SIZE>> "$LAVA_FIRST_BOOT_LOG" 2>&1; then

Subscribers

People subscribed via source and target branches