mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-20 15:21:35 +00:00
Import patches-unapplied version 2.446 to ubuntu/artful-proposed
Imported using git-ubuntu import. Changelog parent: e55a4a791001ac3d9845de89c09c61b08d3e244a New changelog entries: * Build ubuntu back with tasks. The metapackage switch was due to g++ transition and needed some additional hint. This is adding maintenance and as mentioned in 2.335, we can revert this.
This commit is contained in:
parent
e55a4a7910
commit
1a48d101d5
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
|||||||
|
livecd-rootfs (2.446) artful; urgency=medium
|
||||||
|
|
||||||
|
* Build ubuntu back with tasks. The metapackage switch was due to g++
|
||||||
|
transition and needed some additional hint. This is adding maintenance
|
||||||
|
and as mentioned in 2.335, we can revert this.
|
||||||
|
|
||||||
|
-- Didier Roche <didrocks@ubuntu.com> Fri, 02 Jun 2017 15:08:29 +0200
|
||||||
|
|
||||||
livecd-rootfs (2.445) artful; urgency=medium
|
livecd-rootfs (2.445) artful; urgency=medium
|
||||||
|
|
||||||
* Resurrect Balint's fix from
|
* Resurrect Balint's fix from
|
||||||
|
@ -233,12 +233,10 @@ case $BINARYFORMAT in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
SIGNED_KERNEL_PACKAGE="linux-signed-generic"
|
SIGNED_KERNEL_PACKAGE="linux-signed-generic"
|
||||||
UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal"
|
|
||||||
|
|
||||||
case $PROJECT in
|
case $PROJECT in
|
||||||
ubuntu|ubuntu-dvd)
|
ubuntu|ubuntu-dvd)
|
||||||
add_package install ubuntu-minimal ubuntu-standard
|
add_task install minimal standard ubuntu-desktop
|
||||||
add_package install ubuntu-desktop $UNITY_HWE_HINTS
|
|
||||||
LIVE_TASK='ubuntu-live'
|
LIVE_TASK='ubuntu-live'
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
|
amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user