From b58db7cc17f4bb0f23fddcad7e4f48a097efabfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 4 Dec 2015 08:36:08 +0000
Subject: [PATCH] distinguish by hw arch

---
 COPYING              |  2 +-
 ChangeLog            | 10 ++++++++++
 INSTALL              |  2 +-
 build-in-docker.conf |  3 ++-
 build-in-docker.sh   |  6 +++---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/COPYING b/COPYING
index 88798ab..caeca07 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.15/COPYING
\ No newline at end of file
+/usr/share/automake-1.14/COPYING
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index d01507a..d5488fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-12-04 07:05  marc
+
+	* COPYING, ChangeLog, INSTALL, build-in-docker.conf,
+	  build-in-docker.sh, cordova/makefile.am,
+	  cordova/platforms/android/AndroidManifest.xml,
+	  cordova/platforms/android/assets/www/cordova_plugins.js,
+	  cordova/platforms/android/res/xml/config.xml,
+	  cordova/plugins/android.json, cordova/plugins/fetch.json,
+	  html/index.html.in: build all in docker
+
 2015-12-02 15:58  marc
 
 	* build-in-docker.conf, build-in-docker.sh,
diff --git a/INSTALL b/INSTALL
index ddcdb76..f812f5a 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
\ No newline at end of file
+/usr/share/automake-1.14/INSTALL
\ No newline at end of file
diff --git a/build-in-docker.conf b/build-in-docker.conf
index 3310463..6389436 100644
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@@ -3,7 +3,8 @@
 if test -n "${ANDROID_HOME}"; then
     # all this is needed for android through cordova (phonegap) only
     packages+=("wheezy:::curl:::npm")
-    packages+=("git nodejs default-jdk libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
+    packages+=("amd64:::libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
+    packages+=("git nodejs default-jdk")
     repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com precise universe'")
     repos+=("Debian|Ubuntu-precise::::::universe")
     repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'")
diff --git a/build-in-docker.sh b/build-in-docker.sh
index ac091ae..f63e0e9 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -136,14 +136,14 @@ function ifthenelse() {
         os="${arg%%:::*}"
         thenpart="${arg#*:::}"
         if test "${thenpart/:::/}" = "${thenpart}"; then
-            docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
+            docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
         else
             elsepart="${thenpart##*:::}"
             thenpart="${thenpart%:::*}"
             if test -n "${thenpart}"; then
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
+                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
             else
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
+                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
             fi    
         fi
     fi