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

* Use the correct metapackage for edubuntu-desktop, and add HWE_HINTS

Browse Source 
* Add KUBUNTU_HWE_HINTS and populate to work around task->meta change
This commit is contained in:
Adam Conrad 2015-02-14 00:08:24 -07:00
parent 93012bbfc6
commit d5e4b69cdb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,7 +1,7 @@
livecd-rootfs (2.208.4) UNRELEASED; urgency=medium livecd-rootfs (2.208.4) UNRELEASED; urgency=medium
* Use the correct metapackage for edubuntu-desktop * Use the correct metapackage for edubuntu-desktop, and add HWE_HINTS
* Hint pinentry-qt4 for kubuntu-desktop to avoid GNOME deps. * Add KUBUNTU_HWE_HINTS and populate to work around task->meta change
-- Adam Conrad <adconrad@ubuntu.com> Wed, 04 Feb 2015 04:42:54 -0700 -- Adam Conrad <adconrad@ubuntu.com> Wed, 04 Feb 2015 04:42:54 -0700

6
live-build/auto/config
View File

@ -195,6 +195,8 @@ esac
HWE_X_PACKAGES="xserver-xorg-lts-utopic libegl1-mesa-drivers-lts-utopic xserver-xorg-video-all-lts-utopic" HWE_X_PACKAGES="xserver-xorg-lts-utopic libegl1-mesa-drivers-lts-utopic xserver-xorg-video-all-lts-utopic"
SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic" SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic"
UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity" UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity"
KUBUNTU_HWE_HINTS="pinentry-qt4"
EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal"
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
@ -234,7 +236,7 @@ case $PROJECT in
xserver-xorg-input-evdev-omap-revert xserver-xorg-input-evdev-omap-revert
;; ;;
*) *)
add_package install kubuntu-desktop pinentry-qt4 add_package install kubuntu-desktop $KUBUNTU_HWE_HINTS
add_package install $HWE_X_PACKAGES add_package install $HWE_X_PACKAGES
;; ;;
esac esac
@ -256,7 +258,7 @@ case $PROJECT in
;; ;;
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS $EDUBUNTU_HWE_HINTS
add_package install $HWE_X_PACKAGES add_package install $HWE_X_PACKAGES
LIVE_TASK='edubuntu-live' LIVE_TASK='edubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'