Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop setting manual options for getting an ubuntu-touch preinstalled tarball, we set -f plain in cdimage to get proper configuration already

Browse Source
This commit is contained in:
Oliver Grawert 2013-05-06 12:53:38 +02:00
parent fff524ae55
commit c69174945c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.130) UNRELEASED; urgency=low
* make sure we build a plain filesystem for ubuntu-touch (this should
automatically produce a preinstalled tarball)
-- Oliver Grawert <ogra@ubuntu.com> Mon, 06 May 2013 12:48:17 +0200
livecd-rootfs (2.129) saucy; urgency=low livecd-rootfs (2.129) saucy; urgency=low
* Disable zsync for ubuntu-touch images. * Disable zsync for ubuntu-touch images.

4
live-build/auto/config
View File

@ -152,7 +152,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf add_package live oem-config-debconf ubiquity-frontend-debconf
;; ;;
ubuntu-core|base) ubuntu-core|base|ubuntu-touch)
;; ;;
*) *)
add_package live oem-config-gtk ubiquity-frontend-gtk add_package live oem-config-gtk ubiquity-frontend-gtk
@ -268,11 +268,9 @@ case $PROJECT in
ubuntu-touch) ubuntu-touch)
add_package install ubuntu-minimal ubuntu-touch add_package install ubuntu-minimal ubuntu-touch
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
BINARY_IMAGES=tar
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
OPTS="${OPTS:+$OPTS }--apt-recommends false" OPTS="${OPTS:+$OPTS }--apt-recommends false"
OPTS="${OPTS:+$OPTS }--binary-filesystem ext4"
OPTS="${OPTS:+$OPTS }--compression gzip" OPTS="${OPTS:+$OPTS }--compression gzip"
OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap" OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
OPTS="${OPTS:+$OPTS }--swap-file-size 100" OPTS="${OPTS:+$OPTS }--swap-file-size 100"