diff --git a/debian/changelog b/debian/changelog index 0e05baf9..cb59f09f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.285) UNRELEASED; urgency=medium + + * touch: removing dependencies on a specific mir platform driver as mir can + now identify and load the correct driver during runtime + + -- Ricardo Salveti de Araujo Wed, 11 Feb 2015 23:35:42 -0200 + livecd-rootfs (2.284) vivid; urgency=medium * bump the gshadow hash in 00-uid-gid-fix.chroot_early too diff --git a/live-build/auto/config b/live-build/auto/config index 1b61f57c..3f849d35 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -404,7 +404,7 @@ case $PROJECT in ;; ubuntu-touch) - add_package install ubuntu-minimal mir-client-platform-android libmirplatform5driver-android ubuntu-touch + add_package install ubuntu-minimal 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 84b991a7..185a68b6 100755 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot @@ -3,8 +3,5 @@ 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 -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