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

Remove obsolete pvr-omap4 special-casing to simplify configs.

Browse Source
This commit is contained in:
Adam Conrad 2016-04-03 02:41:30 -06:00
parent faf8c3b838
commit 5ac47abce7
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.396) UNRELEASED; urgency=medium
* Remove obsolete pvr-omap4 special-casing to simplify configs.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 03 Apr 2016 02:39:50 -0600
livecd-rootfs (2.395) xenial; urgency=medium livecd-rootfs (2.395) xenial; urgency=medium
* create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on * create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on

26
live-build/auto/config
View File

@ -192,20 +192,7 @@ UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_package install ubuntu-minimal ubuntu-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
# stack (the metapackage doesn't). We want the
# "reverted" one.
add_package install ubuntu-desktop \
xserver-xorg-core-omap-revert \
xserver-xorg-video-omap-revert \
xserver-xorg-input-evdev-omap-revert
;;
*)
add_package install ubuntu-desktop $UNITY_HWE_HINTS add_package install ubuntu-desktop $UNITY_HWE_HINTS
;;
esac
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 ;;
@ -233,20 +220,7 @@ case $PROJECT in
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
add_task install minimal standard add_task install minimal standard
case "$ARCH+$SUBARCH" in
armhf+omap4)
# Don't use the task as this drags in the regular X
# stack (the metapackage doesn't). We want the
# "reverted" one.
add_package install kubuntu-desktop \
xserver-xorg-core-omap-revert \
xserver-xorg-video-omap-revert \
xserver-xorg-input-evdev-omap-revert
;;
*)
add_task install kubuntu-desktop add_task install kubuntu-desktop
;;
esac
LIVE_TASK='kubuntu-live' LIVE_TASK='kubuntu-live'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic ;; amd64) add_package live linux-signed-generic ;;