Linaro

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

  1. live-helper.config.natty.alip
  2. Merge into live-helper.config.natty.alip
Proposed by Tom Gall
Status: Merged
Merged at revision: 58
Proposed branch: lp:~tom-gall/linaro/live-helper.config.natty.alip
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.alip
Diff against target: 155 lines (+24/-23)
4 files modified
binary (+15/-15)
chroot (+1/-1)
common (+5/-4)
conf_create.sh (+3/-3)
To merge this branch: bzr merge lp:~tom-gall/linaro/live-helper.config.natty.alip
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+41767@code.launchpad.net

Description of the change

Update for natty.

Use linaro-overlay-minimal instead of chessy
use linaro as the system name

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:08:01 +0000
3+++ binary 2010-11-24 17:27:56 +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 Minimal Live)
80+LH_SYSLINUX_MENU_LIVE_ENTRY="Start Linaro Minimal 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
85=== modified file 'chroot'
86--- chroot 2010-10-05 19:24:52 +0000
87+++ chroot 2010-11-24 17:27:56 +0000
88@@ -46,7 +46,7 @@
89
90 # $LH_PACKAGES: set packages to install
91 # (Default: empty)
92-LH_PACKAGES="chessy-overlay-minimal linaro-alip xserver-xorg-video-fbdev"
93+LH_PACKAGES="linaro-overlay-minimal linaro-alip xserver-xorg-video-fbdev"
94
95 # $LH_PACKAGES_LISTS: set package list to install
96 # (Default: )
97
98=== modified file 'common'
99--- common 2010-11-10 19:09:32 +0000
100+++ common 2010-11-24 17:27:56 +0000
101@@ -1,7 +1,7 @@
102 # config/common - common options for live-helper(7)
103
104 # LH_CONFIG_VERSION: internal version of the configuration file format
105-LH_CONFIG_VERSION="2.0~a10"
106+LH_CONFIG_VERSION="2.0~a21"
107
108 # $LH_APT: set package manager
109 # (Default: apt)
110@@ -25,7 +25,7 @@
111
112 # $LH_APT_RECOMMENDS: set apt/aptitude recommends
113 # (Default: true)
114-LH_APT_RECOMMENDS="false"
115+LH_APT_RECOMMENDS="true"
116
117 # $LH_APT_SECURE: set apt/aptitude security
118 # (Default: true)
119@@ -69,7 +69,7 @@
120
121 # $LH_FDISK: set fdisk program
122 # (Default: autodetected)
123-LH_FDISK="fdisk"
124+LH_FDISK="fdisk.distrib"
125
126 # $LH_LOSETUP: set losetup program
127 # (Default: autodetected)
128@@ -128,4 +128,5 @@
129 # Internal stuff (FIXME)
130 APT_OPTIONS="--yes -o DPkg::options::=--path-exclude=/usr/share/doc/* -o DPkg::options::=--path-include=/usr/share/doc/*/copyright -o DPkg::options::=--path-exclude=/usr/share/man/* -o DPkg::options::=--path-exclude=/usr/share/groff/* -o DPkg::options::=--path-exclude=/usr/share/info/* -o DPkg::options::=--path-exclude=/usr/share/lintian/* -o DPkg::options::=--path-exclude=/usr/share/linda/* -o DPkg::options::=--path-exclude=/usr/share/locale/* -o DPkg::options::=--path-include=/usr/share/locale/locale.alias"
131 APTITUDE_OPTIONS="--assume-yes"
132-GZIP_OPTIONS="--best"
133+GZIP_OPTIONS="--best --rsyncable"
134+ISOHYBRID_OPTIONS=""
135
136=== modified file 'conf_create.sh'
137--- conf_create.sh 2010-11-10 19:08:01 +0000
138+++ conf_create.sh 2010-11-24 17:27:56 +0000
139@@ -6,13 +6,13 @@
140 keyring_packages=ubuntu-keyring
141 linux_flavours=""
142 tasks="standard"
143- packages="chessy-overlay-minimal linaro-alip xserver-xorg-video-fbdev"
144+ packages="linaro-overlay-minimal linaro-alip xserver-xorg-video-fbdev"
145 packages_list=""
146 bootstrap_flavour="standard"
147 distribution=natty
148- hostname=chessy
149+ hostname=linaro
150 initramfs="none"
151- brand="Chessy Minimal"
152+ brand="Linaro Minimal"
153 chrootsources="chroot_sources"
154 cache="disabled"
155 }

Subscribers

People subscribed via source and target branches

to all changes: