Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 21:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.410 to ubuntu/yakkety-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: ad693abb51773b9636b970f09ed5537b2fd45579

New changelog entries:
  * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
  * Drop special-casing of ubuntu-core:system-image in places, now that
    ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
This commit is contained in:
Steve Langasek 2016-05-09 16:32:58 -07:00 committed by usd-importer
parent ad693abb51
commit aca40d6ebf
2 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.410) yakkety; urgency=medium
* Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
* Drop special-casing of ubuntu-core:system-image in places, now that
ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 May 2016 16:32:58 -0700
livecd-rootfs (2.409) yakkety; urgency=medium livecd-rootfs (2.409) yakkety; urgency=medium
[ Michael Vogt ] [ Michael Vogt ]

20
live-build/auto/config
View File

@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server) ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf add_package live oem-config-debconf ubiquity-frontend-debconf
;; ;;
ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next) ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
;; ;;
*) *)
add_package live oem-config-gtk ubiquity-frontend-gtk add_package live oem-config-gtk ubiquity-frontend-gtk
@ -350,11 +350,6 @@ case $PROJECT in
;; ;;
ubuntu-core) ubuntu-core)
# 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
OPTS="${OPTS:+$OPTS }--apt-recommends false" OPTS="${OPTS:+$OPTS }--apt-recommends false"
# some workarounds because the seeds are not quite # some workarounds because the seeds are not quite
@ -409,7 +404,10 @@ case $PROJECT in
# universe needed for 'system-image-cli' and multiverse for firmware # universe needed for 'system-image-cli' and multiverse for firmware
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
fi OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
ubuntu-base)
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;
@ -557,18 +555,12 @@ case $ARCH in
esac esac
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd) ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
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