Linaro

Merge lp:~tom-gall/linaro/live-helper.config.natty.handset-plasma into lp:~linaro-maintainers/linaro/live-helper.config.natty.handset-plasma

  1. live-helper.config.natty.handset-plasma
  2. Merge into live-helper.config.natty.h...
Proposed by Tom Gall
Status: Merged
Merged at revision: 54
Proposed branch: lp:~tom-gall/linaro/live-helper.config.natty.handset-plasma
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.handset-plasma
Diff against target: 168 lines (+27/-26)
4 files modified
binary (+17/-17)
chroot (+1/-1)
common (+5/-4)
conf_create.sh (+4/-4)
To merge this branch: bzr merge lp:~tom-gall/linaro/live-helper.config.natty.handset-plasma
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+42018@code.launchpad.net

Description of the change

Update to use linaro overlay, change the system name to be linaro as well as commit an updated binary, common and chroot files from running sh conf_config.sh

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'binary'
2--- binary 2010-11-10 19:20:20 +0000
3+++ binary 2010-11-27 16:52:59 +0000
4@@ -9,8 +9,8 @@
5 LH_BINARY_IMAGES="tar"
6
7 # $LH_BINARY_INDICES: set apt/aptitude generic indices
8-# (Default: false)
9-LH_BINARY_INDICES="false"
10+# (Default: true)
11+LH_BINARY_INDICES="true"
12
13 # $LH_BOOT_FLAVOURS: set bootparts flavours
14 # (Default: )
15@@ -30,12 +30,12 @@
16
17 # $LH_CHECKSUMS: set checksums
18 # (Default: md5)
19-#LH_CHECKSUMS="md5"
20+LH_CHECKSUMS="md5"
21
22-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
23+# ${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
24 # (Default: true)
25 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
26-LH_CHROOT_BUILD="true"
27+LH_BUILD_WITH_CHROOT="true"
28
29 # $LH_DEBIAN_INSTALLER: set debian-installer
30 # (Default: false)
31@@ -62,24 +62,24 @@
32 LH_GRUB_SPLASH=""
33
34 # $LH_HOSTNAME: set hostname
35-# (Default: chessy)
36-LH_HOSTNAME="chessy"
37+# (Default: linaro)
38+LH_HOSTNAME="linaro"
39
40 # $LH_ISO_APPLICATION: set iso author
41 # (Default: Ubuntu Live)
42 LH_ISO_APPLICATION="Ubuntu Live"
43
44 # $LH_ISO_PREPARER: set iso preparer
45-# (Default: live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper)
46-LH_ISO_PREPARER="live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper"
47+# (Default: live-helper $VERSION; http://packages.qa.debian.org/live-helper)
48+LH_ISO_PREPARER="live-helper $VERSION; http://packages.qa.debian.org/live-helper"
49
50 # $LH_ISO_PUBLISHER: set iso publisher
51 # (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)
52 LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"
53
54 # $LH_ISO_VOLUME: set iso volume (max 32 chars)
55-# (Default: Ubuntu lucid 20100520-09:07)
56-LH_ISO_VOLUME="Ubuntu lucid 20100520-09:07"
57+# (Default: Ubuntu natty $(date +%Y%m%d-%H:%M))
58+LH_ISO_VOLUME="Ubuntu natty $(date +%Y%m%d-%H:%M)"
59
60 # $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
61 # (Default: unset)
62@@ -102,8 +102,8 @@
63 LH_NET_ROOT_MOUNTOPTIONS=""
64
65 # $LH_NET_ROOT_PATH: set netboot server directory
66-# (Default: /srv/chessy-live)
67-LH_NET_ROOT_PATH="/srv/chessy-live"
68+# (Default: /srv/linaro-live)
69+LH_NET_ROOT_PATH="/srv/linaro-live"
70
71 # $LH_NET_ROOT_SERVER: set netboot server address
72 # (Default: 192.168.1.1)
73@@ -146,8 +146,8 @@
74 LH_SYSLINUX_MENU="true"
75
76 # $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
77-# (Default: Start Chessy Minimal Live)
78-LH_SYSLINUX_MENU_LIVE_ENTRY="Start Chessy Minimal Live"
79+# (Default: Start Linaro Handset Plasma Live)
80+LH_SYSLINUX_MENU_LIVE_ENTRY="Start Linaro Handset Plasma Live"
81
82 # $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
83 # (Default: )
84@@ -158,8 +158,8 @@
85 LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
86
87 # $LH_USERNAME: set username
88-# (Default: chessy)
89-LH_USERNAME="chessy"
90+# (Default: linaro)
91+LH_USERNAME="linaro"
92
93 # $LH_UBOOT_FLAVOURS: set ubootparts flavours
94 # (Default: )
95
96=== modified file 'chroot'
97--- chroot 2010-10-06 11:38:58 +0000
98+++ chroot 2010-11-27 16:52:59 +0000
99@@ -46,7 +46,7 @@
100
101 # $LH_PACKAGES: set packages to install
102 # (Default: empty)
103-LH_PACKAGES="chessy-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
104+LH_PACKAGES="linaro-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
105
106 # $LH_PACKAGES_LISTS: set package list to install
107 # (Default: )
108
109=== modified file 'common'
110--- common 2010-10-06 11:38:58 +0000
111+++ common 2010-11-27 16:52:59 +0000
112@@ -1,7 +1,7 @@
113 # config/common - common options for live-helper(7)
114
115 # LH_CONFIG_VERSION: internal version of the configuration file format
116-LH_CONFIG_VERSION="2.0~a10"
117+LH_CONFIG_VERSION="2.0~a21"
118
119 # $LH_APT: set package manager
120 # (Default: apt)
121@@ -88,8 +88,8 @@
122 LH_USE_FAKEROOT="false"
123
124 # $LH_TASKSEL: set tasksel program
125-# (Default: tasksel)
126-LH_TASKSEL="tasksel"
127+# (Default: apt)
128+LH_TASKSEL="apt"
129
130 # $LH_INCLUDES: set includes
131 # (Default: /usr/share/live-helper/includes)
132@@ -128,4 +128,5 @@
133 # Internal stuff (FIXME)
134 APT_OPTIONS="--yes"
135 APTITUDE_OPTIONS="--assume-yes"
136-GZIP_OPTIONS="--best "
137+GZIP_OPTIONS="--best --rsyncable"
138+ISOHYBRID_OPTIONS=""
139
140=== modified file 'conf_create.sh'
141--- conf_create.sh 2010-11-10 19:20:20 +0000
142+++ conf_create.sh 2010-11-27 16:52:59 +0000
143@@ -6,13 +6,13 @@
144 keyring_packages=ubuntu-keyring
145 linux_flavours=""
146 tasks="standard"
147- packages="chessy-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
148+ packages="linaro-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
149 packages_list=""
150 bootstrap_flavour="standard"
151 distribution=natty
152- hostname=chessy
153+ hostname=linaro
154 initramfs="none"
155- brand="Chessy Minimal"
156+ brand="Linaro Handset Plasma"
157 chrootsources="chroot_sources"
158 cache="disabled"
159 }
160@@ -49,7 +49,7 @@
161 \
162 --binary-images "tar" \
163 --binary-filesystem ext3 \
164- --username chessy \
165+ --username linaro \
166 --debian-installer-distribution "$distribution" \
167 --debian-installer-gui false \
168 --hostname "$hostname" \

Subscribers

People subscribed via source and target branches

to all changes: