Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-13 20:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump the hardcoded libmirplatform driver version for ubuntu-touch

Browse Source
This commit is contained in:
Ricardo Salveti de Araujo 2015-01-14 13:32:27 -02:00
parent b1c0d77000
commit 0ba451f9df
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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: * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early:
- port static uid/gid setup from ubuntu-touch - port static uid/gid setup from ubuntu-touch
-- Michael Vogt <michael.vogt@ubuntu.com> 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 <ricardo.salveti@canonical.com> Wed, 14 Jan 2015 13:31:43 -0200
livecd-rootfs (2.274) vivid; urgency=medium livecd-rootfs (2.274) vivid; urgency=medium

2
live-build/auto/config
View File

@ -389,7 +389,7 @@ case $PROJECT in
;; ;;
ubuntu-touch) 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' COMPONENTS='main restricted universe'
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'

12
live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot
View File

@ -3,16 +3,8 @@
echo "I: making libhybris the default alternatives for @DEB_HOST_MULTIARCH@_egl_conf" 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 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@_mirplatform5driver_conf"
echo "I: making android the default alternatives for @DEB_HOST_MULTIARCH@_mirclient8driver_conf" update-alternatives --set @DEB_HOST_MULTIARCH@_mirplatform5driver_conf /usr/lib/@DEB_HOST_MULTIARCH@/mir/platform5driver/android/ld.so.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
# ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives. # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives.
LDCONFIG_NOTRIGGER=y ldconfig LDCONFIG_NOTRIGGER=y ldconfig