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

merge change for 2.335 from the archive

Browse Source
This commit is contained in:
Oliver Grawert 2015-08-11 11:27:42 +02:00
parent a2f671f88b
commit 751153543a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.335) UNRELEASED; urgency=medium
* Attempt to build Ubuntu image using metapackages instead of tasks; this
is necessary in order to build a test image out of wily-proposed for the
g++5 transition, but may be reverted later if this doesn't turn out to
be maintainable. (Code taken from the trusty HWE LTS branch of
livecd-rootfs.)
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 09 Aug 2015 22:54:24 -0700
livecd-rootfs (2.334) wily; urgency=medium
* add dnsmasq user to snappy builds, needed by ubuntu-fan

9
live-build/auto/config
View File

@ -180,9 +180,12 @@ case $BINARYFORMAT in
;;
esac
SIGNED_KERNEL_PACKAGE="linux-signed-generic"
UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal"
case $PROJECT in
ubuntu|ubuntu-dvd)
add_task install minimal standard
add_package install ubuntu-minimal ubuntu-standard
case "$ARCH+$SUBARCH" in
armhf+omap4)
# Don't use the task as this drags in the regular X
@ -194,12 +197,12 @@ case $PROJECT in
xserver-xorg-input-evdev-omap-revert
;;
*)
add_task install ubuntu-desktop
add_package install ubuntu-desktop $UNITY_HWE_HINTS
;;
esac
LIVE_TASK='ubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac
;;