diff --git a/debian/changelog b/debian/changelog index 8f2af7d4..926c398c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.205) UNRELEASED; urgency=medium + + * touch/48-setup-env.chroot: QML2_IMPORT_PATH should respect + DEB_HOST_MULTIARCH (as we now have i386 builds as well) + + -- Ricardo Salveti de Araujo Tue, 18 Feb 2014 23:51:24 -0300 + livecd-rootfs (2.204) trusty; urgency=medium * Make livecd-rootfs be Architecture: any so that we can go back to the diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index c8da3645..6450d40e 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -2,6 +2,8 @@ echo "I: setting up initial environment for Touch..." +DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH) + echo "HOSTNAME=android TERM=linux ANDROID_CACHE=/cache @@ -13,7 +15,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/arm-linux-gnueabihf/qt5/imports +QML2_IMPORT_PATH=/usr/lib/$DEB_HOST_MULTIARCH/qt5/imports QT_SELECT=qt5 SHLVL=1 MKSH=/system/bin/sh