Linaro

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

  1. live-helper.config.natty.netbook-efl
  2. Merge into live-helper.config.natty.n...
Proposed by Tom Gall
Status: Merged
Merged at revision: 52
Proposed branch: lp:~tom-gall/linaro/live-helper.config.natty.netbook-efl
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.netbook-efl
Diff against target: 202 lines (+32/-31)
5 files modified
binary (+18/-18)
bootstrap (+2/-2)
chroot (+1/-1)
common (+6/-5)
conf_create.sh (+5/-5)
To merge this branch: bzr merge lp:~tom-gall/linaro/live-helper.config.natty.netbook-efl
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+41761@code.launchpad.net

Description of the change

Upgrades live helper config for natty, including using the linaro minimal overlay, using linaro as the hostname.

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-10-19 07:38:30 +0000
3+++ binary 2010-11-24 17:02:53 +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@@ -43,7 +43,7 @@
32
33 # $LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
34 # (Default: empty)
35-LH_DEBIAN_INSTALLER_DISTRIBUTION="maverick"
36+LH_DEBIAN_INSTALLER_DISTRIBUTION="natty"
37
38 # $LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
39 # (Default: )
40@@ -62,24 +62,24 @@
41 LH_GRUB_SPLASH=""
42
43 # $LH_HOSTNAME: set hostname
44-# (Default: chessy)
45-LH_HOSTNAME="chessy"
46+# (Default: linaro)
47+LH_HOSTNAME="linaro"
48
49 # $LH_ISO_APPLICATION: set iso author
50 # (Default: Ubuntu Live)
51 LH_ISO_APPLICATION="Ubuntu Live"
52
53 # $LH_ISO_PREPARER: set iso preparer
54-# (Default: live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper)
55-LH_ISO_PREPARER="live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper"
56+# (Default: live-helper $VERSION; http://packages.qa.debian.org/live-helper)
57+LH_ISO_PREPARER="live-helper $VERSION; http://packages.qa.debian.org/live-helper"
58
59 # $LH_ISO_PUBLISHER: set iso publisher
60 # (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)
61 LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"
62
63 # $LH_ISO_VOLUME: set iso volume (max 32 chars)
64-# (Default: Ubuntu lucid 20100520-09:07)
65-LH_ISO_VOLUME="Ubuntu lucid 20100520-09:07"
66+# (Default: Ubuntu natty $(date +%Y%m%d-%H:%M))
67+LH_ISO_VOLUME="Ubuntu natty $(date +%Y%m%d-%H:%M)"
68
69 # $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
70 # (Default: unset)
71@@ -102,8 +102,8 @@
72 LH_NET_ROOT_MOUNTOPTIONS=""
73
74 # $LH_NET_ROOT_PATH: set netboot server directory
75-# (Default: /srv/chessy-live)
76-LH_NET_ROOT_PATH="/srv/chessy-live"
77+# (Default: /srv/linaro-live)
78+LH_NET_ROOT_PATH="/srv/linaro-live"
79
80 # $LH_NET_ROOT_SERVER: set netboot server address
81 # (Default: 192.168.1.1)
82@@ -146,8 +146,8 @@
83 LH_SYSLINUX_MENU="true"
84
85 # $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
86-# (Default: Start Chessy Minimal Live)
87-LH_SYSLINUX_MENU_LIVE_ENTRY="Start Chessy Minimal Live"
88+# (Default: Start Linaro Minimal Live)
89+LH_SYSLINUX_MENU_LIVE_ENTRY="Start Linaro Minimal Live"
90
91 # $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
92 # (Default: )
93@@ -158,8 +158,8 @@
94 LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
95
96 # $LH_USERNAME: set username
97-# (Default: chessy)
98-LH_USERNAME="chessy"
99+# (Default: linaro)
100+LH_USERNAME="linaro"
101
102 # $LH_UBOOT_FLAVOURS: set ubootparts flavours
103 # (Default: )
104
105=== modified file 'bootstrap'
106--- bootstrap 2010-09-15 22:27:48 +0000
107+++ bootstrap 2010-11-24 17:02:53 +0000
108@@ -25,8 +25,8 @@
109 LH_BOOTSTRAP_KEYRING=""
110
111 # $LH_DISTRIBUTION: select distribution to use
112-# (Default: maverick)
113-LH_DISTRIBUTION="maverick"
114+# (Default: natty)
115+LH_DISTRIBUTION="natty"
116
117 # $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
118 # (Default: http://ports.ubuntu.com/)
119
120=== modified file 'chroot'
121--- chroot 2010-10-22 10:24:52 +0000
122+++ chroot 2010-11-24 17:02:53 +0000
123@@ -46,7 +46,7 @@
124
125 # $LH_PACKAGES: set packages to install
126 # (Default: empty)
127-LH_PACKAGES="chessy-overlay-minimal linaro-netbook-efl xserver-xorg-video-fbdev"
128+LH_PACKAGES="linaro-overlay-minimal linaro-netbook-efl xserver-xorg-video-fbdev"
129
130 # $LH_PACKAGES_LISTS: set package list to install
131 # (Default: )
132
133=== modified file 'common'
134--- common 2010-09-02 11:38:56 +0000
135+++ common 2010-11-24 17:02:53 +0000
136@@ -1,7 +1,7 @@
137 # config/common - common options for live-helper(7)
138
139 # LH_CONFIG_VERSION: internal version of the configuration file format
140-LH_CONFIG_VERSION="2.0~a10"
141+LH_CONFIG_VERSION="2.0~a21"
142
143 # $LH_APT: set package manager
144 # (Default: apt)
145@@ -69,7 +69,7 @@
146
147 # $LH_FDISK: set fdisk program
148 # (Default: autodetected)
149-LH_FDISK="fdisk"
150+LH_FDISK="fdisk.distrib"
151
152 # $LH_LOSETUP: set losetup program
153 # (Default: autodetected)
154@@ -88,8 +88,8 @@
155 LH_USE_FAKEROOT="false"
156
157 # $LH_TASKSEL: set tasksel program
158-# (Default: tasksel)
159-LH_TASKSEL="tasksel"
160+# (Default: apt)
161+LH_TASKSEL="apt"
162
163 # $LH_INCLUDES: set includes
164 # (Default: /usr/share/live-helper/includes)
165@@ -128,4 +128,5 @@
166 # Internal stuff (FIXME)
167 APT_OPTIONS="--yes"
168 APTITUDE_OPTIONS="--assume-yes"
169-GZIP_OPTIONS="--best"
170+GZIP_OPTIONS="--best --rsyncable"
171+ISOHYBRID_OPTIONS=""
172
173=== modified file 'conf_create.sh'
174--- conf_create.sh 2010-10-02 20:50:35 +0000
175+++ conf_create.sh 2010-11-24 17:02:53 +0000
176@@ -6,13 +6,13 @@
177 keyring_packages=ubuntu-keyring
178 linux_flavours=""
179 tasks="standard"
180- packages="chessy-overlay-minimal linaro-netbook-efl xserver-xorg-video-fbdev"
181+ packages="linaro-overlay-minimal linaro-netbook-efl xserver-xorg-video-fbdev"
182 packages_list=""
183 bootstrap_flavour="standard"
184- distribution=maverick
185- hostname=chessy
186+ distribution=natty
187+ hostname=linaro
188 initramfs="none"
189- brand="Chessy Minimal"
190+ brand="Linaro Minimal"
191 chrootsources="chroot_sources"
192 cache="disabled"
193 }
194@@ -49,7 +49,7 @@
195 \
196 --binary-images "tar" \
197 --binary-filesystem ext3 \
198- --username chessy \
199+ --username linaro \
200 --debian-installer-distribution "$distribution" \
201 --debian-installer-gui false \
202 --hostname "$hostname" \

Subscribers

People subscribed via source and target branches

to all changes: