Import patches-unapplied version 2.86 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: d2dadbecc0ef9ac9fe351e65f7eea27a7cc70e50

New changelog entries:
  * Reorganise code to avoid kernel installation on
    ubuntu-server/ubuntu-core so that it works for all architectures.
This commit is contained in:
Colin Watson 2012-09-11 16:56:43 +01:00 committed by usd-importer
parent d2dadbecc0
commit a571547648
2 changed files with 15 additions and 5 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.86) quantal; urgency=low
* Reorganise code to avoid kernel installation on
ubuntu-server/ubuntu-core so that it works for all architectures.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 11 Sep 2012 16:56:43 +0100
livecd-rootfs (2.85) quantal; urgency=low
* live-build/auto/config: Set KERNEL_FLAVOURS=none for ubuntu-server as

View File

@ -231,17 +231,12 @@ case $PROJECT in
ubuntu-server)
add_task install minimal
OPTS="${OPTS:+$OPTS }--linux-packages=none"
KERNEL_FLAVOURS=none
COMPONENTS='main'
PREINSTALL_POOL_SEEDS='server-ship'
;;
ubuntu-core)
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
OPTS="${OPTS:+$OPTS }--linux-packages=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
*)
@ -303,6 +298,14 @@ case $ARCH in
;;
esac
case $PROJECT in
ubuntu-server|ubuntu-core)
OPTS="${OPTS:+$OPTS }--linux-packages=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
esac
add_chroot_hook update-apt-file-cache
add_chroot_hook update-apt-xapian-index
add_chroot_hook update-mlocate-database