From 7c2e3247f108b146e20d5dde116097a58f7620d2 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed, 14 Sep 2016 14:27:40 -0500
Subject: [PATCH] Import patches-unapplied version 2.431 to
 ubuntu/yakkety-proposed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Imported using git-ubuntu import.

Changelog parent: 326e7b0b9714c7f615425951c385fd2b99b9234e

New changelog entries:
  [ Łukasz 'sil2100' Zemczak ]
  * Temporarily change the 60-install-click.chroot script to pull in clicks for
    arm64 builds from a different location for ubuntu-touch.
---
 debian/changelog                                |  8 ++++++++
 .../ubuntu-touch/hooks/60-install-click.chroot  | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 740a6f23..3c27ce00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.431) yakkety; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Temporarily change the 60-install-click.chroot script to pull in clicks for
+    arm64 builds from a different location for ubuntu-touch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 14 Sep 2016 14:27:40 -0500
+
 livecd-rootfs (2.430) yakkety; urgency=medium
 
   [ Michael Vogt ]
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot
index 2fec8a0f..cbebda2b 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.chroot
+++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot
@@ -4,8 +4,19 @@ set -e
 
 echo "Setting up click packages"
 
+CLICKARCH=$(dpkg --print-architecture)
+
 click_uri=http://archive-team.internal/click_packages
-click_list=$click_uri/click_list
+if [ "$CLICKARCH" = "arm64" ]; then
+    # FIXME: this is temporary. Since right now we can't have arm64 clicks in the store
+    # (before implementing fat-packages), we need to fetch the arm64 click list from a
+    # different place 
+    click_list=$click_uri/click_list.arm64
+    click_install_flags="--allow-unauthenticated"
+else
+    click_list=$click_uri/click_list
+    click_install_flags=""
+fi
 click_db=/usr/share/click/preinstalled
 click_db_custom=/custom/click
 
@@ -20,8 +31,6 @@ 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
@@ -61,7 +70,7 @@ do
                 mv /etc/click/databases/10_core.conf \
                    /etc/click/databases/10_core.conf.tmp
             fi
-            click install --force-missing-framework --root="$root" --all-users \
+            click install --force-missing-framework --root="$root" --all-users $click_install_flags \
                 "$tmpdir/$package"
             if [ "$root" = "$click_db_custom" ]; then
                 mv /etc/click/databases/10_core.conf.tmp \