Import patches-unapplied version 2.230 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 157b5a339e

New changelog entries:
  * lp:~mvo/livecd-rootfs/ubuntu-core-system-image:
    - install the "ubuntu-core" task and a kernel when building 
      ubuntu-core with SUBPROJECT=system-image
impish 2.230
Michael Vogt 11 years ago committed by usd-importer
parent 157b5a339e
commit d4626e0b8e

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.230) utopic; urgency=low
* lp:~mvo/livecd-rootfs/ubuntu-core-system-image:
- install the "ubuntu-core" task and a kernel when building
ubuntu-core with SUBPROJECT=system-image
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 28 Jul 2014 20:10:56 +0200
livecd-rootfs (2.229) utopic; urgency=medium livecd-rootfs (2.229) utopic; urgency=medium
[ Michael Terry ] [ Michael Terry ]

@ -324,6 +324,13 @@ case $PROJECT in
ubuntu-core) ubuntu-core)
add_task install minimal add_task install minimal
# mvo: This is for cron.daily-preinstalled
# CDIMAGE_PREINSTALLED is not passed from build.py
# and PREINSTALLED means something different. So
# we use SUBPROJECT to pass on the information
if [ "$SUBPROJECT" = "system-image" ]; then
add_task install ubuntu-core
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;
@ -429,11 +436,17 @@ esac
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch) ubuntu-server|ubuntu-core|ubuntu-touch)
case $SUBPROJECT in
system-image)
# keep the kernel for the system-image build
;;
*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;
esac esac
esac
add_chroot_hook update-apt-file-cache add_chroot_hook update-apt-file-cache
add_chroot_hook update-apt-xapian-index add_chroot_hook update-apt-xapian-index

Loading…
Cancel
Save