Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 0bdd19822012087c4b901a838f143c0bbdbc7383

New changelog entries:
  [ James Hunt ]
  * live-build/auto/config: Enable universe for system-image ubuntu-core
    sub-project which requires 'system-image-cli'.
This commit is contained in:
Colin Watson 2014-07-30 17:56:04 +01:00 committed by usd-importer
parent 0bdd198220
commit 82eb59481a
2 changed files with 22 additions and 12 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.232) utopic; urgency=medium
[ James Hunt ]
* live-build/auto/config: Enable universe for system-image ubuntu-core
sub-project which requires 'system-image-cli'.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 30 Jul 2014 17:56:04 +0100
livecd-rootfs (2.231) utopic; urgency=medium
* Hard-code installation of libmirclientplatform-android and

26
live-build/auto/config
View File

@ -324,13 +324,15 @@ case $PROJECT in
ubuntu-core)
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
# 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
# universe needed for 'system-image-cli'
COMPONENTS='main restricted universe'
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
@ -436,14 +438,14 @@ esac
case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch)
case $SUBPROJECT in
case $SUBPROJECT in
system-image)
# keep the kernel for the system-image build
# keep the kernel for the system-image build
;;
*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false
;;
esac
esac