Merge lp:~dpigott/lava-master-image-scripts/re-baseline-to-13-03-release into lp:lava-master-image-scripts

Proposed by Dave Pigott on 2013-04-17
Status: Merged
Approved by: Tyler Baker on 2013-04-17
Approved revision: 75
Merged at revision: 75
Proposed branch: lp:~dpigott/lava-master-image-scripts/re-baseline-to-13-03-release
Merge into: lp:lava-master-image-scripts
Diff against target: 210 lines (+26/-75)
8 files modified
boards.d/arndale.conf (+6/-6)
boards.d/beagle.conf (+3/-3)
boards.d/imx53.conf (+3/-3)
boards.d/origen.conf (+3/-3)
boards.d/panda.conf (+3/-3)
boards.d/snowball.conf (+4/-25)
boards.d/vexpress.conf (+0/-28)
lava-create-master (+4/-4)
To merge this branch: bzr merge lp:~dpigott/lava-master-image-scripts/re-baseline-to-13-03-release
Reviewer Review Type Date Requested Status
Tyler Baker 2013-04-17 Approve on 2013-04-17
Review via email: mp+159390@code.launchpad.net

Description of the change

Move (appropriate) boards to 13.03 baseline to take account of UEFI and uboot updates

To post a comment you must log in.
Tyler Baker (tyler-baker) wrote :

I pulled this down locally and tested it. Thanks for fixing this so quickly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'boards.d/arndale.conf'
2--- boards.d/arndale.conf 2013-02-03 09:22:49 +0000
3+++ boards.d/arndale.conf 2013-04-17 13:32:01 +0000
4@@ -1,15 +1,15 @@
5 # vim: syntax=sh
6 DESC="Samsung Arndale Board"
7 # Root File System
8-ROOTFS=linaro-quantal-nano-20130128-256.tar.gz
9-ROOTFS_URL=https://snapshots.linaro.org/quantal/images/nano/256/$ROOTFS
10-ROOTFS_MD5=a241955a790e3b7305adf1982f4be6da
11+ROOTFS=$COMMON_ROOTFS
12+ROOTFS_URL=$COMMON_ROOTFS_URL
13+ROOTFS_MD5=$COMMON_ROOTFS_MD5
14 # Root filesystem partition number as created by linaro-media-create
15 ROOTFS_PARTITION=3
16 # Hardware Pack
17-HWPACK=hwpack_linaro-arndale_20130203-67_armhf_supported.tar.gz
18-HWPACK_URL=https://snapshots.linaro.org/quantal/hwpacks/arndale/67/$HWPACK
19-HWPACK_MD5=4733154ed2c448b37edadb0568761d38
20+HWPACK=hwpack_linaro-arndale_20130324-276_armhf_supported.tar.gz
21+HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/arndale/$HWPACK
22+HWPACK_MD5=f62efcd0244df529a21f3bcc29e5e7f4
23 # Device name for linaro-media-create
24 LMC_DEV=arndale
25 # Device name for LAVA
26
27=== modified file 'boards.d/beagle.conf'
28--- boards.d/beagle.conf 2013-01-29 12:30:39 +0000
29+++ boards.d/beagle.conf 2013-04-17 13:32:01 +0000
30@@ -1,9 +1,9 @@
31 # vim: syntax=sh
32 DESC="TI Beagle Board (both the C4 and XM versions)"
33 # Root File System
34-ROOTFS=$COMMON_ROOTFS
35-ROOTFS_URL=$COMMON_ROOTFS_URL
36-ROOTFS_MD5=$COMMON_ROOTFS_MD5
37+ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
38+ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$ROOTFS
39+ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
40 # Root filesystem partition number as created by linaro-media-create
41 ROOTFS_PARTITION=2
42 # Hardware Pack
43
44=== modified file 'boards.d/imx53.conf'
45--- boards.d/imx53.conf 2013-01-29 12:30:39 +0000
46+++ boards.d/imx53.conf 2013-04-17 13:32:01 +0000
47@@ -4,9 +4,9 @@
48 # device.
49 DESC="Freescale iMX53 Quick Start Board"
50 # Root File System
51-ROOTFS=$COMMON_ROOTFS
52-ROOTFS_URL=$COMMON_ROOTFS_URL
53-ROOTFS_MD5=$COMMON_ROOTFS_MD5
54+ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
55+ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$ROOTFS
56+ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
57 # Root filesystem partition number as created by linaro-media-create
58 ROOTFS_PARTITION=3
59 # Hardware Pack
60
61=== modified file 'boards.d/origen.conf'
62--- boards.d/origen.conf 2013-01-29 12:30:39 +0000
63+++ boards.d/origen.conf 2013-04-17 13:32:01 +0000
64@@ -1,9 +1,9 @@
65 # vim: syntax=sh
66 DESC="Samsung Origen Board"
67 # Root File System
68-ROOTFS=$COMMON_ROOTFS
69-ROOTFS_URL=$COMMON_ROOTFS_URL
70-ROOTFS_MD5=$COMMON_ROOTFS_MD5
71+ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
72+ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$COMMON_ROOTFS
73+ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
74 # Root filesystem partition number as created by linaro-media-create
75 ROOTFS_PARTITION=3
76 # Hardware Pack
77
78=== modified file 'boards.d/panda.conf'
79--- boards.d/panda.conf 2013-01-29 12:30:39 +0000
80+++ boards.d/panda.conf 2013-04-17 13:32:01 +0000
81@@ -7,9 +7,9 @@
82 # Root filesystem partition number as created by linaro-media-create
83 ROOTFS_PARTITION=2
84 # Hardware Pack
85-HWPACK=hwpack_linaro-lt-panda_20120221-1_armel_supported.tar.gz
86-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
87-HWPACK_MD5=67da422b8ed81b6dba80fd57882d3ac0
88+HWPACK=hwpack_linaro-panda_20130328-278_armhf_supported.tar.gz
89+HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/panda/$HWPACK
90+HWPACK_MD5=0c7baf3de1f9562a5ce1d1ff7fd97886
91 # Device name for linaro-media-create
92 LMC_DEV=panda
93 # Device name for LAVA
94
95=== modified file 'boards.d/snowball.conf'
96--- boards.d/snowball.conf 2013-01-29 12:30:39 +0000
97+++ boards.d/snowball.conf 2013-04-17 13:32:01 +0000
98@@ -7,9 +7,9 @@
99 # Root filesystem partition number as created by linaro-media-create
100 ROOTFS_PARTITION=2
101 # Hardware Pack
102-HWPACK=hwpack_linaro-lt-snowball_20120221-1_armel_supported.tar.gz
103-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
104-HWPACK_MD5=f392883d5ab4df726ed5e2e308afd68a
105+HWPACK=hwpack_linaro-snowball_20130328-278_armhf_supported.tar.gz
106+HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/snowball/$HWPACK
107+HWPACK_MD5=97be883448455c97129dfbe2f00c5824
108 # Device name for linaro-media-create
109 LMC_DEV=snowball_sd
110 # Device name for LAVA
111@@ -25,26 +25,5 @@
112 # be defined in this file. The function has to be called
113 # ${board}_download_and_md5() where ${board} is the name of this file without
114 # the .conf suffix.
115-LICENSE_WRAP=1
116+LICENSE_WRAP=
117
118-# Custom download function
119-snowball_download_and_md5() {
120- # Download a file to $1 from URL $2.
121- # The expected md5 checksum is $3
122- check_md5_or_remove "$1" "$3" && return 0
123- echo " * NOTE: Accepting STE license agreement... "
124- verbose " * Downloading $2..."
125- wget \
126- --header="Cookie: stelicenseaccepted-v1=true; downloadrequested=/$(echo $2 | cut -d / -f 4-)" \
127- --output-document="$1" \
128- --user-agent="lava-create-master ($LAVA_VERSION)" \
129- --quiet \
130- --referer="http://releases.linaro.org/licenses/ste.html" \
131- "http://releases.linaro.org/licenses/ste-accepted.html"
132- if ! check_md5_or_remove "$1" "$3"; then
133- echo "Error: checksum mismatch for $1" >&2
134- return 1
135- else
136- return 0
137- fi
138-}
139
140=== renamed file 'boards.d/vexpress-a5.conf' => 'boards.d/vexpress.conf'
141--- boards.d/vexpress-a5.conf 2013-04-17 11:45:31 +0000
142+++ boards.d/vexpress.conf 2013-04-17 13:32:01 +0000
143@@ -1,9 +1,9 @@
144 # vim: syntax=sh
145 DESC="ARM Versatile Express"
146 # Root File System
147-ROOTFS=linaro-quantal-nano-20130328-317.tar.gz
148-ROOTFS_URL=https://releases.linaro.org/13.03/ubuntu/quantal-images/nano/$ROOTFS
149-ROOTFS_MD5=7d7bbd79e0cc7d93fb05a138b25a9142
150+ROOTFS=$COMMON_ROOTFS
151+ROOTFS_URL=$COMMON_ROOTFS_URL
152+ROOTFS_MD5=$COMMON_ROOTFS_MD5
153 # Root filesystem partition number as created by linaro-media-create
154 ROOTFS_PARTITION=2
155 # Hardware Pack
156
157=== removed file 'boards.d/vexpress.conf'
158--- boards.d/vexpress.conf 2013-01-29 12:30:39 +0000
159+++ boards.d/vexpress.conf 1970-01-01 00:00:00 +0000
160@@ -1,28 +0,0 @@
161-# vim: syntax=sh
162-DESC="ARM Versatile Express"
163-# Root File System
164-ROOTFS=$COMMON_ROOTFS
165-ROOTFS_URL=$COMMON_ROOTFS_URL
166-ROOTFS_MD5=$COMMON_ROOTFS_MD5
167-# Root filesystem partition number as created by linaro-media-create
168-ROOTFS_PARTITION=2
169-# Hardware Pack
170-HWPACK=hwpack_linaro-lt-vexpress-a9_20120221-1_armel_supported.tar.gz
171-HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
172-HWPACK_MD5=3c5562d100c669b6bc951f8565fe1988
173-# Device name for linaro-media-create
174-LMC_DEV=vexpress-a9
175-# Device name for LAVA
176-LAVA_DEV=lava:vexpress
177-# Does the board support preEnv.txt for setting bootdelay?
178-LAVA_PRE_ENV=N
179-# Is it a 2part or 3part partition scheme?
180-LAVA_PARTITION_SCHEME=2part
181-# Which is the boot device for LAVA partitioning?
182-LAVA_BOOT_DEVICE="/dev/mmcblk0"
183-# When LICENSE_WRAP is not empty then a custom download handler is required to
184-# evade the license wrapper. In such cases a dedicated download function must
185-# be defined in this file. The function has to be called
186-# ${board}_download_and_md5() where ${board} is the name of this file without
187-# the .conf suffix.
188-LICENSE_WRAP=
189
190=== modified file 'lava-create-master'
191--- lava-create-master 2013-03-13 13:21:33 +0000
192+++ lava-create-master 2013-04-17 13:32:01 +0000
193@@ -2,13 +2,13 @@
194 set -e
195
196 # LAVA create master version
197-LAVA_VERSION=2013.01
198+LAVA_VERSION=2013.03
199 LAVA_URL=https://launchpad.net/lava-master-image-scripts
200
201 # Common root filesystem that is the base for all boards
202-COMMON_ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
203-COMMON_ROOTFS_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$COMMON_ROOTFS
204-COMMON_ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
205+COMMON_ROOTFS=linaro-quantal-nano-20130328-317.tar.gz
206+COMMON_ROOTFS_URL=https://releases.linaro.org/13.03/ubuntu/quantal-images/nano/$COMMON_ROOTFS
207+COMMON_ROOTFS_MD5=7d7bbd79e0cc7d93fb05a138b25a9142
208
209 # When non-empty the tool is verbose
210 export VERBOSE=

Subscribers

People subscribed via source and target branches