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
=== modified file 'binary'
--- binary 2010-11-10 19:20:20 +0000
+++ binary 2010-11-27 16:52:59 +0000
@@ -9,8 +9,8 @@
9LH_BINARY_IMAGES="tar"9LH_BINARY_IMAGES="tar"
1010
11# $LH_BINARY_INDICES: set apt/aptitude generic indices11# $LH_BINARY_INDICES: set apt/aptitude generic indices
12# (Default: false)12# (Default: true)
13LH_BINARY_INDICES="false"13LH_BINARY_INDICES="true"
1414
15# $LH_BOOT_FLAVOURS: set bootparts flavours15# $LH_BOOT_FLAVOURS: set bootparts flavours
16# (Default: )16# (Default: )
@@ -30,12 +30,12 @@
3030
31# $LH_CHECKSUMS: set checksums31# $LH_CHECKSUMS: set checksums
32# (Default: md5)32# (Default: md5)
33#LH_CHECKSUMS="md5"33LH_CHECKSUMS="md5"
3434
35# ${LH_CHROOT_BUILD: control if we build binary images chrooted35# ${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
36# (Default: true)36# (Default: true)
37# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.37# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
38LH_CHROOT_BUILD="true"38LH_BUILD_WITH_CHROOT="true"
3939
40# $LH_DEBIAN_INSTALLER: set debian-installer40# $LH_DEBIAN_INSTALLER: set debian-installer
41# (Default: false)41# (Default: false)
@@ -62,24 +62,24 @@
62LH_GRUB_SPLASH=""62LH_GRUB_SPLASH=""
6363
64# $LH_HOSTNAME: set hostname64# $LH_HOSTNAME: set hostname
65# (Default: chessy)65# (Default: linaro)
66LH_HOSTNAME="chessy"66LH_HOSTNAME="linaro"
6767
68# $LH_ISO_APPLICATION: set iso author68# $LH_ISO_APPLICATION: set iso author
69# (Default: Ubuntu Live)69# (Default: Ubuntu Live)
70LH_ISO_APPLICATION="Ubuntu Live"70LH_ISO_APPLICATION="Ubuntu Live"
7171
72# $LH_ISO_PREPARER: set iso preparer72# $LH_ISO_PREPARER: set iso preparer
73# (Default: live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper)73# (Default: live-helper $VERSION; http://packages.qa.debian.org/live-helper)
74LH_ISO_PREPARER="live-helper 2.0~a10-1; http://packages.qa.debian.org/live-helper"74LH_ISO_PREPARER="live-helper $VERSION; http://packages.qa.debian.org/live-helper"
7575
76# $LH_ISO_PUBLISHER: set iso publisher76# $LH_ISO_PUBLISHER: set iso publisher
77# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)77# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)
78LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"78LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"
7979
80# $LH_ISO_VOLUME: set iso volume (max 32 chars)80# $LH_ISO_VOLUME: set iso volume (max 32 chars)
81# (Default: Ubuntu lucid 20100520-09:07)81# (Default: Ubuntu natty $(date +%Y%m%d-%H:%M))
82LH_ISO_VOLUME="Ubuntu lucid 20100520-09:07"82LH_ISO_VOLUME="Ubuntu natty $(date +%Y%m%d-%H:%M)"
8383
84# $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size84# $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
85# (Default: unset)85# (Default: unset)
@@ -102,8 +102,8 @@
102LH_NET_ROOT_MOUNTOPTIONS=""102LH_NET_ROOT_MOUNTOPTIONS=""
103103
104# $LH_NET_ROOT_PATH: set netboot server directory104# $LH_NET_ROOT_PATH: set netboot server directory
105# (Default: /srv/chessy-live)105# (Default: /srv/linaro-live)
106LH_NET_ROOT_PATH="/srv/chessy-live"106LH_NET_ROOT_PATH="/srv/linaro-live"
107107
108# $LH_NET_ROOT_SERVER: set netboot server address108# $LH_NET_ROOT_SERVER: set netboot server address
109# (Default: 192.168.1.1)109# (Default: 192.168.1.1)
@@ -146,8 +146,8 @@
146LH_SYSLINUX_MENU="true"146LH_SYSLINUX_MENU="true"
147147
148# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries148# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
149# (Default: Start Chessy Minimal Live)149# (Default: Start Linaro Handset Plasma Live)
150LH_SYSLINUX_MENU_LIVE_ENTRY="Start Chessy Minimal Live"150LH_SYSLINUX_MENU_LIVE_ENTRY="Start Linaro Handset Plasma Live"
151151
152# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)152# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
153# (Default: )153# (Default: )
@@ -158,8 +158,8 @@
158LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"158LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
159159
160# $LH_USERNAME: set username160# $LH_USERNAME: set username
161# (Default: chessy)161# (Default: linaro)
162LH_USERNAME="chessy"162LH_USERNAME="linaro"
163163
164# $LH_UBOOT_FLAVOURS: set ubootparts flavours164# $LH_UBOOT_FLAVOURS: set ubootparts flavours
165# (Default: )165# (Default: )
166166
=== modified file 'chroot'
--- chroot 2010-10-06 11:38:58 +0000
+++ chroot 2010-11-27 16:52:59 +0000
@@ -46,7 +46,7 @@
4646
47# $LH_PACKAGES: set packages to install47# $LH_PACKAGES: set packages to install
48# (Default: empty)48# (Default: empty)
49LH_PACKAGES="chessy-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"49LH_PACKAGES="linaro-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
5050
51# $LH_PACKAGES_LISTS: set package list to install51# $LH_PACKAGES_LISTS: set package list to install
52# (Default: )52# (Default: )
5353
=== modified file 'common'
--- common 2010-10-06 11:38:58 +0000
+++ common 2010-11-27 16:52:59 +0000
@@ -1,7 +1,7 @@
1# config/common - common options for live-helper(7)1# config/common - common options for live-helper(7)
22
3# LH_CONFIG_VERSION: internal version of the configuration file format3# LH_CONFIG_VERSION: internal version of the configuration file format
4LH_CONFIG_VERSION="2.0~a10"4LH_CONFIG_VERSION="2.0~a21"
55
6# $LH_APT: set package manager6# $LH_APT: set package manager
7# (Default: apt)7# (Default: apt)
@@ -88,8 +88,8 @@
88LH_USE_FAKEROOT="false"88LH_USE_FAKEROOT="false"
8989
90# $LH_TASKSEL: set tasksel program90# $LH_TASKSEL: set tasksel program
91# (Default: tasksel)91# (Default: apt)
92LH_TASKSEL="tasksel"92LH_TASKSEL="apt"
9393
94# $LH_INCLUDES: set includes94# $LH_INCLUDES: set includes
95# (Default: /usr/share/live-helper/includes)95# (Default: /usr/share/live-helper/includes)
@@ -128,4 +128,5 @@
128# Internal stuff (FIXME)128# Internal stuff (FIXME)
129APT_OPTIONS="--yes"129APT_OPTIONS="--yes"
130APTITUDE_OPTIONS="--assume-yes"130APTITUDE_OPTIONS="--assume-yes"
131GZIP_OPTIONS="--best "131GZIP_OPTIONS="--best --rsyncable"
132ISOHYBRID_OPTIONS=""
132133
=== modified file 'conf_create.sh'
--- conf_create.sh 2010-11-10 19:20:20 +0000
+++ conf_create.sh 2010-11-27 16:52:59 +0000
@@ -6,13 +6,13 @@
6 keyring_packages=ubuntu-keyring6 keyring_packages=ubuntu-keyring
7 linux_flavours=""7 linux_flavours=""
8 tasks="standard"8 tasks="standard"
9 packages="chessy-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"9 packages="linaro-overlay-minimal linaro-handset-plasma xserver-xorg-video-fbdev"
10 packages_list=""10 packages_list=""
11 bootstrap_flavour="standard"11 bootstrap_flavour="standard"
12 distribution=natty12 distribution=natty
13 hostname=chessy13 hostname=linaro
14 initramfs="none"14 initramfs="none"
15 brand="Chessy Minimal"15 brand="Linaro Handset Plasma"
16 chrootsources="chroot_sources"16 chrootsources="chroot_sources"
17 cache="disabled"17 cache="disabled"
18}18}
@@ -49,7 +49,7 @@
49 \49 \
50 --binary-images "tar" \50 --binary-images "tar" \
51 --binary-filesystem ext3 \51 --binary-filesystem ext3 \
52 --username chessy \52 --username linaro \
53 --debian-installer-distribution "$distribution" \53 --debian-installer-distribution "$distribution" \
54 --debian-installer-gui false \54 --debian-installer-gui false \
55 --hostname "$hostname" \55 --hostname "$hostname" \

Subscribers

People subscribed via source and target branches

to all changes: