From 4570a8250fb9cbfb7c548518bfb7ec6b4c8b3181 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 11 Oct 2014 08:54:42 +0100 Subject: [PATCH 1/4] Update hardcoded libmir*-android installations for Mir 0.8.0. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a5b439d..119fb2ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.253) UNRELEASED; urgency=medium + + * Update hardcoded libmir*-android installations for Mir 0.8.0. + + -- Colin Watson Sat, 11 Oct 2014 08:54:13 +0100 + livecd-rootfs (2.252) utopic; urgency=low [ James Hunt ] diff --git a/live-build/auto/config b/live-build/auto/config index 70429d39..4d191e0e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -354,7 +354,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal libmirclientplatform-android libmirplatformgraphics-android ubuntu-touch + add_package install ubuntu-minimal libmirclient8driver-android libmirplatform3driver-android ubuntu-touch COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' From a4870efde1b36655cffc558144c4616868396c7f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 11 Oct 2014 08:55:56 +0100 Subject: [PATCH 2/4] releasing package livecd-rootfs version 2.253 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 119fb2ed..7fc1e542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.253) UNRELEASED; urgency=medium +livecd-rootfs (2.253) utopic; urgency=medium * Update hardcoded libmir*-android installations for Mir 0.8.0. - -- Colin Watson Sat, 11 Oct 2014 08:54:13 +0100 + -- Colin Watson Sat, 11 Oct 2014 08:54:47 +0100 livecd-rootfs (2.252) utopic; urgency=low From 908891a41a1bd852e56bc1980d3b101314a88ce6 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 11 Oct 2014 13:13:13 +0200 Subject: [PATCH 3/4] 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 From f581692297b688d5f088fbe52d65d72aefb10721 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 11 Oct 2014 13:13:39 +0200 Subject: [PATCH 4/4] releasing package livecd-rootfs version 2.254 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 49979175..50080ac4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.254) UNRELEASED; urgency=medium +livecd-rootfs (2.254) utopic; urgency=medium * force the right alternative when the libmir*-android packages are installed, so that accidentially pulled in -mesa versions will not provide