diff --git a/debian/changelog b/debian/changelog index 551053a4..d5fc1d31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -livecd-rootfs (2.274) UNRELEASED; urgency=low +livecd-rootfs (2.275) UNRELEASED; urgency=low + [ Michael Vogt ] * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: - port static uid/gid setup from ubuntu-touch - -- Michael Vogt Wed, 07 Jan 2015 09:36:11 +0100 + [ Ricardo Salveti de Araujo ] + * Bump the hardcoded libmirplatform driver version for ubuntu-touch + + -- Ricardo Salveti de Araujo Wed, 14 Jan 2015 13:31:43 -0200 livecd-rootfs (2.274) vivid; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 5d7dcd9b..1d6ae894 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -389,7 +389,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal libmirclient8driver-android libmirplatform4driver-android ubuntu-touch + add_package install ubuntu-minimal mir-client-platform-android libmirplatform5driver-android ubuntu-touch COMPONENTS='main restricted universe' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' diff --git a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot index 5ad50927..84b991a7 100755 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot @@ -3,16 +3,8 @@ 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 libmirplatform4driver-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@_mirplatform4driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/platform4driver/android/ld.so.conf -fi +echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirplatform5driver_conf" +update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform5driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/mir/platform5driver/android/ld.so.conf # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives. LDCONFIG_NOTRIGGER=y ldconfig