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

Proposed by Dave Pigott on 2013-07-04
Status: Merged
Approved by: Dave Pigott on 2013-07-04
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 on 2013-07-04
Review via email: mp+173037@code.launchpad.net
To post a comment you must log in.
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'boards.d/panda.conf'
2--- boards.d/panda.conf 2013-04-17 13:00:29 +0000
3+++ boards.d/panda.conf 2013-07-04 15:11:40 +0000
4@@ -1,15 +1,15 @@
5 # vim: syntax=sh
6 DESC="TI Panda Board (43xx and 46xx)"
7 # Root File System
8-ROOTFS=$COMMON_ROOTFS
9-ROOTFS_URL=$COMMON_ROOTFS_URL
10-ROOTFS_MD5=$COMMON_ROOTFS_MD5
11+ROOTFS=linaro-raring-nano-20130623-410.tar.gz
12+ROOTFS_URL=http://releases.linaro.org/13.06/ubuntu/raring-images/nano/$ROOTFS
13+ROOTFS_MD5=7d4cc6fbbc4a1d9214eb6d105e290bce
14 # Root filesystem partition number as created by linaro-media-create
15 ROOTFS_PARTITION=2
16 # Hardware Pack
17-HWPACK=hwpack_linaro-panda_20130328-278_armhf_supported.tar.gz
18-HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/panda/$HWPACK
19-HWPACK_MD5=0c7baf3de1f9562a5ce1d1ff7fd97886
20+HWPACK=hwpack_linaro-panda_20130623-376_armhf_supported.tar.gz
21+HWPACK_URL=http://releases.linaro.org/13.06/ubuntu/panda/$HWPACK
22+HWPACK_MD5=10488a9f7b1246bc9291c4156bf0f686
23 # Device name for linaro-media-create
24 LMC_DEV=panda
25 # Device name for LAVA
26
27=== modified file 'master-rootfs-extras/lib/lava/lava-master-init'
28--- master-rootfs-extras/lib/lava/lava-master-init 2013-07-04 11:34:29 +0000
29+++ master-rootfs-extras/lib/lava/lava-master-init 2013-07-04 15:11:40 +0000
30@@ -57,6 +57,7 @@
31 return 1
32 fi
33 echo "stty columns 10000" >> /etc/profile
34+ echo "export FLASH_KERNEL_SKIP=1" >> /etc/profile
35 # Do disk partitioning
36 echo "Partitioning disk to LAVA format" >> "$LAVA_FIRST_BOOT_LOG"
37 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