From 59393695b6879ad215217533b218ff0f5584f0fd Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 26 Nov 2013 15:14:18 +0100
Subject: [PATCH] Import patches-unapplied version 2.199 to
 ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 7d39f42e935512bb488b3a64a6e38062e29af938

New changelog entries:
  * make the click package installation check for proper architecture before
    trying to install packages from the list, so that i386 touch builds do not
    fall over with "wrong architecture" failures at the click install step.
---
 debian/changelog                                     |  8 ++++++++
 .../ubuntu-touch/hooks/60-install-click.chroot       | 12 ++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d92cd6c..7ff25976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.199) trusty; urgency=low
+
+  * make the click package installation check for proper architecture before
+    trying to install packages from the list, so that i386 touch builds do not 
+    fall over with "wrong architecture" failures at the click install step.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 26 Nov 2013 15:14:18 +0100
+
 livecd-rootfs (2.198) trusty; urgency=low
 
   * Double-quotes prevented the previous change from working, so drop those.
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot
index 6e29a364..aa35a915 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.chroot
+++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot
@@ -15,11 +15,15 @@ tmpdir="$(mktemp -d)"
 cleanup () { rm -rf "$tmpdir"; }
 trap cleanup EXIT
 
+CLICKARCH=$(dpkg --print-architecture)
+
 wget --no-verbose -O "$tmpdir/click_list" "$click_list"
 for package in $(cat "$tmpdir/click_list")
 do
-    echo "Setting up $package"
-    wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
-    click install --force-missing-framework --root="$click_db" --all-users \
-        "$tmpdir/$package"
+    if echo $package | egrep -q _$CLICKARCH.click|_all.click|_unknown.click; then
+        echo "Setting up $package"
+        wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
+        click install --force-missing-framework --root="$click_db" --all-users \
+            "$tmpdir/$package"
+    fi
 done