From cdca3480786caa930f9b93335b614024bc692fee Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 6 May 2013 12:48:17 +0200 Subject: [PATCH] Import patches-unapplied version 2.130 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: efa47e8566ebd4a32caa35a15c7ad50264f821ff New changelog entries: * make sure we build a plain filesystem for ubuntu-touch (this should automatically produce a preinstalled tarball) --- debian/changelog | 7 +++++++ live-build/auto/config | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8e5465b..960213a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.130) saucy; urgency=low + + * make sure we build a plain filesystem for ubuntu-touch (this should + automatically produce a preinstalled tarball) + + -- Oliver Grawert Mon, 06 May 2013 12:48:17 +0200 + livecd-rootfs (2.129) saucy; urgency=low * Disable zsync for ubuntu-touch images. diff --git a/live-build/auto/config b/live-build/auto/config index 6c37834a..f8807fa0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -152,7 +152,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) 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 @@ -268,11 +268,9 @@ case $PROJECT in ubuntu-touch) add_package install ubuntu-minimal ubuntu-touch COMPONENTS='main restricted universe' - BINARY_IMAGES=tar BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' OPTS="${OPTS:+$OPTS }--apt-recommends false" - OPTS="${OPTS:+$OPTS }--binary-filesystem ext4" OPTS="${OPTS:+$OPTS }--compression gzip" OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap" OPTS="${OPTS:+$OPTS }--swap-file-size 100"