Merge lp:~dpigott/lava-master-image-scripts/add-vexpress-tc2 into lp:lava-master-image-scripts

Proposed by Dave Pigott on 2012-09-17
Status: Needs review
Proposed branch: lp:~dpigott/lava-master-image-scripts/add-vexpress-tc2
Merge into: lp:lava-master-image-scripts
Diff against target: 61 lines (+39/-1)
3 files modified
boards.d/vexpresstc2.conf (+22/-0)
lava-enable-gnome-automount (+11/-0)
master-rootfs-extras/bin/lava-partition-disk (+6/-1)
To merge this branch: bzr merge lp:~dpigott/lava-master-image-scripts/add-vexpress-tc2
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve on 2012-09-17
Linaro Validation Team 2012-09-17 Pending
Review via email: mp+124658@code.launchpad.net

Description of the change

Add TC2 master image support

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

+1

I have not tried it but this is probably good

review: Approve
67. By Dave Pigott on 2012-09-17

Add zyga's automount code

Michael Hudson-Doyle (mwhudson) wrote :

Looks plausible, +1 from me.

Unmerged revisions

67. By Dave Pigott on 2012-09-17

Add zyga's automount code

66. By Dave Pigott on 2012-09-17

Post merge

65. By Dave Pigott on 2012-09-17

More vc2 updates

64. By Dave Pigott on 2012-07-24

Add VExpress TC2 device

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'boards.d/vexpresstc2.conf'
2--- boards.d/vexpresstc2.conf 1970-01-01 00:00:00 +0000
3+++ boards.d/vexpresstc2.conf 2012-09-17 14:21:19 +0000
4@@ -0,0 +1,22 @@
5+# vim: syntax=sh
6+DESC="ARM Versatile Express - TC2"
7+# Root File System
8+ROOTFS=linaro-precise-nano-20120626-237.tar.gz
9+ROOTFS_URL=http://releases.linaro.org/12.06/ubuntu/precise-images/nano/$ROOTFS
10+ROOTFS_MD5=8ee72bc38e4739a6720c5bba678d8ed0
11+# Root filesystem partition number as created by linaro-media-create
12+ROOTFS_PARTITION=2
13+# Hardware Pack
14+HWPACK=hwpack_linaro-vexpress_20120627-132_armhf_supported.tar.gz
15+HWPACK_URL=http://releases.linaro.org/12.06/ubuntu/vexpress/$HWPACK
16+HWPACK_MD5=7376ab405e6dff952ed754b968c238fc
17+# Device name for linaro-media-create
18+LMC_DEV=vexpress-a9
19+# Device name for LAVA
20+LAVA_DEV=lava:vexpresstc2
21+# When LICENSE_WRAP is not empty then a custom download handler is required to
22+# evade the license wrapper. In such cases a dedicated download function must
23+# be defined in this file. The function has to be called
24+# ${board}_download_and_md5() where ${board} is the name of this file without
25+# the .conf suffix.
26+LICENSE_WRAP=
27
28=== added file 'lava-enable-gnome-automount'
29--- lava-enable-gnome-automount 1970-01-01 00:00:00 +0000
30+++ lava-enable-gnome-automount 2012-09-17 14:21:19 +0000
31@@ -0,0 +1,11 @@
32+#!/bin/sh
33+set -e
34+
35+# Prevent gnome from popping up windows
36+if [ -n "$(which dconf)" ]; then
37+ dconf write /org/gnome/desktop/media-handling/automount true
38+ dconf write /org/gnome/desktop/media-handling/automount-open true
39+ echo "GNOME automont is now enabled"
40+else
41+ echo "You don't have dconf binary installed"
42+fi
43
44=== modified file 'master-rootfs-extras/bin/lava-partition-disk'
45--- master-rootfs-extras/bin/lava-partition-disk 2012-06-29 06:56:26 +0000
46+++ master-rootfs-extras/bin/lava-partition-disk 2012-09-17 14:21:19 +0000
47@@ -93,8 +93,13 @@
48 SCHEME=2part
49 DEVICE="/dev/mmcblk0"
50 ;;
51+ lava:vexpresstc2)
52+ PRE_ENV=N
53+ SCHEME=2part
54+ DEVICE="/dev/mmcblk0"
55+ ;;
56 *)
57- echo "Board type \"$1\" not supported"
58+ echo "Board type \"$DEVICE_TYPE\" not supported"
59 exit 1
60 ;;
61 esac

Subscribers

People subscribed via source and target branches