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

Import patches-unapplied version 2.158 to ubuntu/saucy-proposed

Browse Source 
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.
This commit is contained in:
Iain Lane 2013-07-16 17:19:22 +01:00 committed by usd-importer
parent ac53f88f18
commit 34b724be60
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -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 <iain.lane@canonical.com> Tue, 16 Jul 2013 17:19:22 +0100
livecd-rootfs (2.157) saucy; urgency=low
* add xserver-xorg-input-evdev-omap-revert and

18
live-build/auto/config
View File

@ -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