From 34a87f0754360df232507fd4c7392f3c81483dda Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 18 Feb 2014 23:51:24 -0300 Subject: [PATCH] Import patches-unapplied version 2.205 to ubuntu/trusty-proposed Imported using git-ubuntu import. Changelog parent: 80e1ad9cbf83d6265ff331801e4375c0dce630ac New changelog entries: * touch/48-setup-env.chroot: QML2_IMPORT_PATH should respect DEB_HOST_MULTIARCH (as we now have i386 builds as well) --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f2af7d4..82de66ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.205) trusty; 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