From 908891a41a1bd852e56bc1980d3b101314a88ce6 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 11 Oct 2014 13:13:13 +0200 Subject: [PATCH] ubuntu-touch: make sure we force the android alternative for libmir*- packages, in case their -mesa equivalent is installed by accident --- debian/changelog | 8 ++++++++ .../ubuntu-touch/hooks/80-enable-libhybris.chroot | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7fc1e542..49979175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.254) UNRELEASED; urgency=medium + + * force the right alternative when the libmir*-android packages are + installed, so that accidentially pulled in -mesa versions will not provide + the default alternatives for them in ubuntu-touch images + + -- Oliver Grawert Sat, 11 Oct 2014 13:09:49 +0200 + livecd-rootfs (2.253) utopic; urgency=medium * Update hardcoded libmir*-android installations for Mir 0.8.0. diff --git a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot index 185a68b6..84a24441 100755 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot @@ -3,5 +3,16 @@ echo "I: making libhybris the default alternatives for @DEB_HOST_MULTIARCH@_egl_conf" update-alternatives --set @DEB_HOST_MULTIARCH@_egl_conf /usr/lib/@DEB_HOST_MULTIARCH@/libhybris-egl/ld.so.conf +if dpkg -l libmirclient8driver-android 2>/dev/null|grep -q ^ii; then + echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirclient8driver_conf" + update-alternatives --set @DEB_HOST_MULTIARCH@_mirclient8driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/client8driver/android/ld.so.conf +fi + + +if dpkg -l libmirplatform3driver-android 2>/dev/null|grep -q ^ii; then + echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirplatform3driver_conf" + update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform3driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/platform3driver/android/ld.so.conf +fi + # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives. LDCONFIG_NOTRIGGER=y ldconfig