From 34b724be60a567ac2138ddad7dbce4996c2a5aa9 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 16 Jul 2013 17:19:22 +0100 Subject: [PATCH] Import patches-unapplied version 2.158 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: ac53f88f184e496a8e64d7d9409ef3d526a3afbc New changelog entries: * Under armhf+omap4, don't use the ubuntu-desktop Task, but use the metapackage instead. The metapackage doesn't pull in the X stack which allows us to additionally install the special "revert" X stack that we require here. --- debian/changelog | 9 +++++++++ live-build/auto/config | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d21627e4..48fa4a9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.158) saucy; urgency=low + + * Under armhf+omap4, don't use the ubuntu-desktop Task, but use the + metapackage instead. The metapackage doesn't pull in the X stack which + allows us to additionally install the special "revert" X stack that we + require here. + + -- Iain Lane Tue, 16 Jul 2013 17:19:22 +0100 + livecd-rootfs (2.157) saucy; urgency=low * add xserver-xorg-input-evdev-omap-revert and diff --git a/live-build/auto/config b/live-build/auto/config index d7c6bbab..d01123e5 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -172,7 +172,21 @@ esac case $PROJECT in ubuntu|ubuntu-dvd) - add_task install minimal standard ubuntu-desktop + 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 ubuntu-desktop \ + xserver-xorg-core-omap-revert \ + xserver-xorg-video-omap-revert \ + xserver-xorg-input-evdev-omap-revert + ;; + *) + add_task install ubuntu-desktop + ;; + esac LIVE_TASK='ubuntu-live' ;; @@ -316,7 +330,7 @@ case $ARCH in add_package install u-boot-linaro-omap4-panda u-boot-tools ;; *) - add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 xserver-xorg-video-omap-revert xserver-xorg-input-evdev-omap-revert + add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 ;; esac BINARY_REMOVE_LINUX=false