From 898c13bafe09b5430a2114893123c9635499e47d Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Sun, 1 Mar 2015 01:27:11 -0300 Subject: [PATCH] Import patches-unapplied version 2.288 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: c68dfb0ea3181f9463b9408886e0911520acdc7e New changelog entries: [ Michael Vogt ] * add dosfstools on snappy to ensure systemd can fsck the /boot partition [ Ricardo Salveti de Araujo ] * touch: don't depend on mir-platform-graphics-android and let that to be handled by the seeds (they can't stop bumping the package name and the graphics-mesa package doesn't cause any harm) --- debian/changelog | 13 +++++++++++++ live-build/auto/config | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72418aac..9d5c8aba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.288) vivid; urgency=low + + [ Michael Vogt ] + * add dosfstools on snappy to ensure systemd can fsck the /boot + partition + + [ Ricardo Salveti de Araujo ] + * touch: don't depend on mir-platform-graphics-android and let that to be + handled by the seeds (they can't stop bumping the package name and the + graphics-mesa package doesn't cause any harm) + + -- Ricardo Salveti de Araujo Sun, 01 Mar 2015 01:27:11 -0300 + livecd-rootfs (2.287) vivid; urgency=low [ Michael Vogt ] diff --git a/live-build/auto/config b/live-build/auto/config index 8396ecd6..62cdd2b0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -375,6 +375,10 @@ case $PROJECT in # no Task: header yet add_package install ubuntu-snappy + # this is required for systemd to fsck the /boot + # partition + add_package install dosfstools + # add special azure package case $ARCH in amd64) @@ -406,7 +410,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal mir-platform-graphics-android ubuntu-touch + add_package install ubuntu-minimal ubuntu-touch COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'