diff --git a/debian/changelog b/debian/changelog index be302166..47d9a95a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.244) UNRELEASED; 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 Tue, 23 Sep 2014 15:58:23 +0100 + livecd-rootfs (2.243) utopic; urgency=medium * Updating apparmor features file for Ubuntu Touch diff --git a/debian/rules b/debian/rules index 78c7615d..24316ff0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,12 @@ #! /usr/bin/make -f %: 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' diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 6450d40e..bdd5f87f 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -2,8 +2,6 @@ echo "I: setting up initial environment for Touch..." -DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH) - echo "HOSTNAME=android TERM=linux ANDROID_CACHE=/cache @@ -15,7 +13,7 @@ ANDROID_BOOTLOGO=1 LD_LIBRARY_PATH=/vendor/lib:/system/lib PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin 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 SHLVL=1 MKSH=/system/bin/sh diff --git a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot index 34dee568..185a68b6 100755 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot @@ -1,9 +1,7 @@ #!/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_NOTRIGGER=y ldconfig