Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-15 23:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge trunk

Browse Source
This commit is contained in:
Colin Watson 2014-10-13 12:46:00 +01:00
commit b47dbe69a7
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -1,10 +1,24 @@
livecd-rootfs (2.253) UNRELEASED; urgency=medium
livecd-rootfs (2.255) UNRELEASED; urgency=medium
* Add support to the ubuntu-touch target to generate a separate custom
tarball as part of the build, moving most click packages into it.
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 09 Oct 2014 20:46:46 -0700
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
the default alternatives for them in ubuntu-touch images
-- Oliver Grawert <ogra@ubuntu.com> 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.
-- Colin Watson <cjwatson@ubuntu.com> Sat, 11 Oct 2014 08:54:47 +0100
livecd-rootfs (2.252) utopic; urgency=low
[ James Hunt ]

2
live-build/auto/config
View File

@ -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'

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

@ -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