Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 17:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.244 to ubuntu/utopic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 662c167d12eeb3e43a0dd4b78ccd5de493583a53

New changelog entries:
  * Substitute DEB_HOST_MULTIARCH into hook scripts at build time, rather
    than relying on dpkg-architecture (which is in dpkg-dev) to be present
    in the image.
This commit is contained in:
Colin Watson 2014-09-23 16:07:41 +01:00 committed by usd-importer
parent 662c167d12
commit aa7b103571
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.244) utopic; urgency=medium
* Substitute DEB_HOST_MULTIARCH into hook scripts at build time, rather
than relying on dpkg-architecture (which is in dpkg-dev) to be present
in the image.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 23 Sep 2014 16:07:41 +0100
livecd-rootfs (2.243) utopic; urgency=medium livecd-rootfs (2.243) utopic; urgency=medium
* Updating apparmor features file for Ubuntu Touch * Updating apparmor features file for Ubuntu Touch

9
debian/rules vendored
View File

@ -1,3 +1,12 @@
#! /usr/bin/make -f #! /usr/bin/make -f
%: %:
dh $@ dh $@
DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_install:
dh_install
find debian/livecd-rootfs -type f -print0 | \
xargs -0r grep -lZ '@DEB_HOST_MULTIARCH@' | \
xargs -0r \
sed -i 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g'

4
live-build/ubuntu-touch/hooks/48-setup-env.chroot
View File

@ -2,8 +2,6 @@
echo "I: setting up initial environment for Touch..." echo "I: setting up initial environment for Touch..."
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
echo "HOSTNAME=android echo "HOSTNAME=android
TERM=linux TERM=linux
ANDROID_CACHE=/cache ANDROID_CACHE=/cache
@ -15,7 +13,7 @@ ANDROID_BOOTLOGO=1
LD_LIBRARY_PATH=/vendor/lib:/system/lib LD_LIBRARY_PATH=/vendor/lib:/system/lib
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ANDROID_DATA=/data ANDROID_DATA=/data
QML2_IMPORT_PATH=/usr/lib/$DEB_HOST_MULTIARCH/qt5/imports QML2_IMPORT_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/imports
QT_SELECT=qt5 QT_SELECT=qt5
SHLVL=1 SHLVL=1
MKSH=/system/bin/sh MKSH=/system/bin/sh

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

@ -1,9 +1,7 @@
#!/bin/sh #!/bin/sh
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH) 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 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
# 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