Merge lp:~vanvugt/mir/fix-1523801 into lp:mir

[Daniel van Vugt]

Fix failing cross compile on xenial due to changes in dpkg-checkbuilddeps
return codes and error messages, which we parse. (LP: #1523801)

This updated script should still work with older dpkg-checkbuilddeps too.

[Alan Griffiths (alan-griffiths)]

Looks sane. (But I'm not upgrading to xenial just to test it!)

review: Approve

[Alexandros Frantzis (afrantzis)]

Works well on xenial.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3184
http://jenkins.qa.ubuntu.com/job/mir-ci/5794/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5179
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/123/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5179
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7708
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25867

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5794/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2015-10-28 05:13:50 +0000
+++ tools/setup-partial-armhf-chroot.sh	2015-12-08 09:58:26 +0000
@@ -80,19 +80,22 @@
 set +e
 
 # Parse dependencies from debian/control
-# dpkg-checkbuilddeps returns 1 when dependencies are not met and the list is sent to stderr
+# dpkg-checkbuilddeps returns non-zero when dependencies are not met and the list is sent to stderr
 builddeps=$(dpkg-checkbuilddeps -a ${arch} --admindir=. ${DEBCONTROL} 2>&1 )
-if [ $? -ne 1 ] ; then
-    echo "${builddeps}"
-    exit 2
+if [ $? -eq 0 ] ; then
+    exit 0 
 fi
+echo "${builddeps}"
 
 # now turn exit on error option
 set -e
 
 # Sanitize dependencies list for submission to multistrap
 # build-essential is not needed as we are cross-compiling
-builddeps=$(echo ${builddeps} | sed -e 's/dpkg-checkbuilddeps://g' -e 's/Unmet build dependencies://g' -e 's/build-essential:native//g')
+builddeps=$(echo ${builddeps} | sed -e 's/dpkg-checkbuilddeps://g' \
+                                    -e 's/error://g' \
+                                    -e 's/Unmet build dependencies://g' \
+                                    -e 's/build-essential:native//g')
 builddeps=$(echo ${builddeps} | sed 's/([^)]*)//g')
 builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
 builddeps=$(echo ${builddeps} | sed -e 's/multistrap//g')