On armhf+omap4, stop using the ubuntu-desktop task and use the metapackage instead

The task pulls in the X stack which the metapackage does not. We can take
advantage of this to install the omap-revert X stack that's needed for these
images.
ubuntu/trusty
Iain Lane 12 years ago
parent b7565b8678
commit 725d1c6ca3

@ -172,7 +172,28 @@ esac
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard ubuntu-desktop add_task install minimal standard
case $ARCH in
armhf)
case $SUBARCH in
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 ubuntu-desktop
;;
esac
;;
*)
add_task ubuntu-desktop
;;
esac
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
;; ;;
@ -316,7 +337,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
;; ;;
*) *)
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 esac
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false

Loading…
Cancel
Save