LAVA master image scripts

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

  1. re-baseline-to-13-03-release
  2. Merge into trunk
Proposed by Dave Pigott
Status: Merged
Approved by: Tyler Baker
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 Approve
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.
Revision history for this message
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
=== modified file 'boards.d/arndale.conf'
--- boards.d/arndale.conf 2013-02-03 09:22:49 +0000
+++ boards.d/arndale.conf 2013-04-17 13:32:01 +0000
@@ -1,15 +1,15 @@
1# vim: syntax=sh1# vim: syntax=sh
2DESC="Samsung Arndale Board"2DESC="Samsung Arndale Board"
3# Root File System3# Root File System
4ROOTFS=linaro-quantal-nano-20130128-256.tar.gz4ROOTFS=$COMMON_ROOTFS
5ROOTFS_URL=https://snapshots.linaro.org/quantal/images/nano/256/$ROOTFS5ROOTFS_URL=$COMMON_ROOTFS_URL
6ROOTFS_MD5=a241955a790e3b7305adf1982f4be6da6ROOTFS_MD5=$COMMON_ROOTFS_MD5
7# Root filesystem partition number as created by linaro-media-create7# Root filesystem partition number as created by linaro-media-create
8ROOTFS_PARTITION=38ROOTFS_PARTITION=3
9# Hardware Pack9# Hardware Pack
10HWPACK=hwpack_linaro-arndale_20130203-67_armhf_supported.tar.gz10HWPACK=hwpack_linaro-arndale_20130324-276_armhf_supported.tar.gz
11HWPACK_URL=https://snapshots.linaro.org/quantal/hwpacks/arndale/67/$HWPACK11HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/arndale/$HWPACK
12HWPACK_MD5=4733154ed2c448b37edadb0568761d3812HWPACK_MD5=f62efcd0244df529a21f3bcc29e5e7f4
13# Device name for linaro-media-create13# Device name for linaro-media-create
14LMC_DEV=arndale14LMC_DEV=arndale
15# Device name for LAVA15# Device name for LAVA
1616
=== modified file 'boards.d/beagle.conf'
--- boards.d/beagle.conf 2013-01-29 12:30:39 +0000
+++ boards.d/beagle.conf 2013-04-17 13:32:01 +0000
@@ -1,9 +1,9 @@
1# vim: syntax=sh1# vim: syntax=sh
2DESC="TI Beagle Board (both the C4 and XM versions)"2DESC="TI Beagle Board (both the C4 and XM versions)"
3# Root File System3# Root File System
4ROOTFS=$COMMON_ROOTFS4ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
5ROOTFS_URL=$COMMON_ROOTFS_URL5ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$ROOTFS
6ROOTFS_MD5=$COMMON_ROOTFS_MD56ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
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
1010
=== modified file 'boards.d/imx53.conf'
--- boards.d/imx53.conf 2013-01-29 12:30:39 +0000
+++ boards.d/imx53.conf 2013-04-17 13:32:01 +0000
@@ -4,9 +4,9 @@
4# device.4# device.
5DESC="Freescale iMX53 Quick Start Board"5DESC="Freescale iMX53 Quick Start Board"
6# Root File System6# Root File System
7ROOTFS=$COMMON_ROOTFS7ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
8ROOTFS_URL=$COMMON_ROOTFS_URL8ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$ROOTFS
9ROOTFS_MD5=$COMMON_ROOTFS_MD59ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
10# Root filesystem partition number as created by linaro-media-create10# Root filesystem partition number as created by linaro-media-create
11ROOTFS_PARTITION=311ROOTFS_PARTITION=3
12# Hardware Pack12# Hardware Pack
1313
=== modified file 'boards.d/origen.conf'
--- boards.d/origen.conf 2013-01-29 12:30:39 +0000
+++ boards.d/origen.conf 2013-04-17 13:32:01 +0000
@@ -1,9 +1,9 @@
1# vim: syntax=sh1# vim: syntax=sh
2DESC="Samsung Origen Board"2DESC="Samsung Origen Board"
3# Root File System3# Root File System
4ROOTFS=$COMMON_ROOTFS4ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz
5ROOTFS_URL=$COMMON_ROOTFS_URL5ROOTFS_URL=https://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$COMMON_ROOTFS
6ROOTFS_MD5=$COMMON_ROOTFS_MD56ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d
7# Root filesystem partition number as created by linaro-media-create7# Root filesystem partition number as created by linaro-media-create
8ROOTFS_PARTITION=38ROOTFS_PARTITION=3
9# Hardware Pack9# Hardware Pack
1010
=== modified file 'boards.d/panda.conf'
--- boards.d/panda.conf 2013-01-29 12:30:39 +0000
+++ boards.d/panda.conf 2013-04-17 13:32:01 +0000
@@ -7,9 +7,9 @@
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-lt-panda_20120221-1_armel_supported.tar.gz10HWPACK=hwpack_linaro-panda_20130328-278_armhf_supported.tar.gz
11HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK11HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/panda/$HWPACK
12HWPACK_MD5=67da422b8ed81b6dba80fd57882d3ac012HWPACK_MD5=0c7baf3de1f9562a5ce1d1ff7fd97886
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 'boards.d/snowball.conf'
--- boards.d/snowball.conf 2013-01-29 12:30:39 +0000
+++ boards.d/snowball.conf 2013-04-17 13:32:01 +0000
@@ -7,9 +7,9 @@
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-lt-snowball_20120221-1_armel_supported.tar.gz10HWPACK=hwpack_linaro-snowball_20130328-278_armhf_supported.tar.gz
11HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK11HWPACK_URL=https://releases.linaro.org/13.03/ubuntu/snowball/$HWPACK
12HWPACK_MD5=f392883d5ab4df726ed5e2e308afd68a12HWPACK_MD5=97be883448455c97129dfbe2f00c5824
13# Device name for linaro-media-create13# Device name for linaro-media-create
14LMC_DEV=snowball_sd14LMC_DEV=snowball_sd
15# Device name for LAVA15# Device name for LAVA
@@ -25,26 +25,5 @@
25# be defined in this file. The function has to be called25# be defined in this file. The function has to be called
26# ${board}_download_and_md5() where ${board} is the name of this file without26# ${board}_download_and_md5() where ${board} is the name of this file without
27# the .conf suffix.27# the .conf suffix.
28LICENSE_WRAP=128LICENSE_WRAP=
2929
30# Custom download function
31snowball_download_and_md5() {
32 # Download a file to $1 from URL $2.
33 # The expected md5 checksum is $3
34 check_md5_or_remove "$1" "$3" && return 0
35 echo " * NOTE: Accepting STE license agreement... "
36 verbose " * Downloading $2..."
37 wget \
38 --header="Cookie: stelicenseaccepted-v1=true; downloadrequested=/$(echo $2 | cut -d / -f 4-)" \
39 --output-document="$1" \
40 --user-agent="lava-create-master ($LAVA_VERSION)" \
41 --quiet \
42 --referer="http://releases.linaro.org/licenses/ste.html" \
43 "http://releases.linaro.org/licenses/ste-accepted.html"
44 if ! check_md5_or_remove "$1" "$3"; then
45 echo "Error: checksum mismatch for $1" >&2
46 return 1
47 else
48 return 0
49 fi
50}
5130
=== renamed file 'boards.d/vexpress-a5.conf' => 'boards.d/vexpress.conf'
--- boards.d/vexpress-a5.conf 2013-04-17 11:45:31 +0000
+++ boards.d/vexpress.conf 2013-04-17 13:32:01 +0000
@@ -1,9 +1,9 @@
1# vim: syntax=sh1# vim: syntax=sh
2DESC="ARM Versatile Express"2DESC="ARM Versatile Express"
3# Root File System3# Root File System
4ROOTFS=linaro-quantal-nano-20130328-317.tar.gz4ROOTFS=$COMMON_ROOTFS
5ROOTFS_URL=https://releases.linaro.org/13.03/ubuntu/quantal-images/nano/$ROOTFS5ROOTFS_URL=$COMMON_ROOTFS_URL
6ROOTFS_MD5=7d7bbd79e0cc7d93fb05a138b25a91426ROOTFS_MD5=$COMMON_ROOTFS_MD5
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
1010
=== removed file 'boards.d/vexpress.conf'
--- boards.d/vexpress.conf 2013-01-29 12:30:39 +0000
+++ boards.d/vexpress.conf 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1# vim: syntax=sh
2DESC="ARM Versatile Express"
3# Root File System
4ROOTFS=$COMMON_ROOTFS
5ROOTFS_URL=$COMMON_ROOTFS_URL
6ROOTFS_MD5=$COMMON_ROOTFS_MD5
7# Root filesystem partition number as created by linaro-media-create
8ROOTFS_PARTITION=2
9# Hardware Pack
10HWPACK=hwpack_linaro-lt-vexpress-a9_20120221-1_armel_supported.tar.gz
11HWPACK_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$HWPACK
12HWPACK_MD5=3c5562d100c669b6bc951f8565fe1988
13# Device name for linaro-media-create
14LMC_DEV=vexpress-a9
15# Device name for LAVA
16LAVA_DEV=lava:vexpress
17# Does the board support preEnv.txt for setting bootdelay?
18LAVA_PRE_ENV=N
19# Is it a 2part or 3part partition scheme?
20LAVA_PARTITION_SCHEME=2part
21# Which is the boot device for LAVA partitioning?
22LAVA_BOOT_DEVICE="/dev/mmcblk0"
23# When LICENSE_WRAP is not empty then a custom download handler is required to
24# evade the license wrapper. In such cases a dedicated download function must
25# be defined in this file. The function has to be called
26# ${board}_download_and_md5() where ${board} is the name of this file without
27# the .conf suffix.
28LICENSE_WRAP=
290
=== modified file 'lava-create-master'
--- lava-create-master 2013-03-13 13:21:33 +0000
+++ lava-create-master 2013-04-17 13:32:01 +0000
@@ -2,13 +2,13 @@
2set -e2set -e
33
4# LAVA create master version4# LAVA create master version
5LAVA_VERSION=2013.015LAVA_VERSION=2013.03
6LAVA_URL=https://launchpad.net/lava-master-image-scripts6LAVA_URL=https://launchpad.net/lava-master-image-scripts
77
8# Common root filesystem that is the base for all boards8# Common root filesystem that is the base for all boards
9COMMON_ROOTFS=linaro-o-nano-tar-20120221-0.tar.gz9COMMON_ROOTFS=linaro-quantal-nano-20130328-317.tar.gz
10COMMON_ROOTFS_URL=http://releases.linaro.org/12.02/ubuntu/oneiric-images/nano/$COMMON_ROOTFS10COMMON_ROOTFS_URL=https://releases.linaro.org/13.03/ubuntu/quantal-images/nano/$COMMON_ROOTFS
11COMMON_ROOTFS_MD5=0d98d935488b56bbd8b291315944bb7d11COMMON_ROOTFS_MD5=7d7bbd79e0cc7d93fb05a138b25a9142
1212
13# When non-empty the tool is verbose13# When non-empty the tool is verbose
14export VERBOSE=14export VERBOSE=

Subscribers

People subscribed via source and target branches