From c9f12e25b1354dd4c64a5b706d401b3c6794f54c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 10 Jun 2015 15:10:03 +0200 Subject: [PATCH] Import patches-unapplied version 2.314 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: eab885e33674c2a0740c9f1b660190ba7109dc9f New changelog entries: [ Iain Lane ] * Small whitespace cleanup in live-build/auto/config [ Sebastien Bacher ] * Set kernel flavours variable to try to fix amd64 build --- debian/changelog | 10 ++++++ live-build/auto/config | 81 +++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c951c34..e7048cf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.314) wily; urgency=medium + + [ Iain Lane ] + * Small whitespace cleanup in live-build/auto/config + + [ Sebastien Bacher ] + * Set kernel flavours variable to try to fix amd64 build + + -- Sebastien Bacher Wed, 10 Jun 2015 15:10:03 +0200 + livecd-rootfs (2.313) wily; urgency=medium * Revert symlink changes, that creates build issues, copy updated hook diff --git a/live-build/auto/config b/live-build/auto/config index 11d8e400..e07c288f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -207,6 +207,7 @@ case $PROJECT in add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs COMPONENTS='main restricted universe' LIVE_TASK='ubuntu-touch-live' + KERNEL_FLAVOURS=generic case $ARCH in amd64) add_package live linux-signed-generic ;; esac @@ -371,48 +372,48 @@ case $PROJECT in # and PREINSTALLED means something different. So # we use SUBPROJECT to pass on the information if [ "$SUBPROJECT" = "system-image" ]; then - OPTS="${OPTS:+$OPTS }--apt-recommends false" - - # some workarounds because the seeds are not quite - # corrent at the moment - add_package install dbus - add_package install isc-dhcp-client - add_package install libpam-systemd - # no Task: header yet - add_package install ubuntu-snappy - - # no minimal as we want to be really minimal - #add_task install minimal + OPTS="${OPTS:+$OPTS }--apt-recommends false" + + # some workarounds because the seeds are not quite + # corrent at the moment + add_package install dbus + add_package install isc-dhcp-client + add_package install libpam-systemd + # no Task: header yet + add_package install ubuntu-snappy + + # no minimal as we want to be really minimal + #add_task install minimal add_task install ubuntu-core - # add special azure package - case $ARCH in - amd64) - # will be removed later when the azure - # specific device tarfile is created - add_package install walinuxagent - ;; - i386) - # efi support can go once the task - # header is available for grub-efi-ia32-bin - add_package install grub-efi-ia32-bin - ;; - esac - - # generic kernel etc - KERNEL_FLAVOURS=generic - case $ARCH in - i386|amd64) - add_package install grub-pc - ;; - armhf) - add_package install flash-kernel u-boot-tools - ;; - esac - OPTS="${OPTS:+$OPTS }--linux-packages=linux-image" - - # contains the framework definition - add_package install ubuntu-core-libs + # add special azure package + case $ARCH in + amd64) + # will be removed later when the azure + # specific device tarfile is created + add_package install walinuxagent + ;; + i386) + # efi support can go once the task + # header is available for grub-efi-ia32-bin + add_package install grub-efi-ia32-bin + ;; + esac + + # generic kernel etc + KERNEL_FLAVOURS=generic + case $ARCH in + i386|amd64) + add_package install grub-pc + ;; + armhf) + add_package install flash-kernel u-boot-tools + ;; + esac + OPTS="${OPTS:+$OPTS }--linux-packages=linux-image" + + # contains the framework definition + add_package install ubuntu-core-libs # universe needed for 'system-image-cli' COMPONENTS='main restricted universe'