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

[Daniel van Vugt]

Fix a few problems that have prevented cross-compile-chroot.sh from
actually working in a while (LP: #1609329)

  * Fixed error: Some build deps not found (because they are in
    universe rather than main?).
  * Fixed error: Building on yakkety as of recently (today) defaults
    to GCC 6, so the default compiler version when targeting xenial
    or wily now needs to be explicitly set to 5.
  * Fixed error: Precompiled headers from GCC 6 don't work when
    targeting any distro other than yakkety, so don't use them.
  * Fixed error: Some headers from android-headers-23 are missing
    #includes, but apparently only when cross-compiling.
  * Fixed warning: Missing public keys for Ubuntu archive.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3632
https://mir-jenkins.ubuntu.com/job/mir-ci/1395/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1695/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1748
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1739
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1739
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1739
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1715
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1715
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1715
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1715
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1715
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1715/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1715/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1395/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Chris Halse Rogers (raof)]

Seems reasonable.

review: Approve

[Daniel van Vugt (vanvugt)]

The CI failure looks unrelated (bug 1523621).

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2016-06-02 05:33:50 +0000
+++ cross-compile-chroot.sh	2016-08-04 08:52:37 +0000
@@ -104,6 +104,10 @@
 gcc_variant=
 if [ "${dist}" = "vivid" ]; then
     gcc_variant=-4.9
+elif [ "${dist}" = "wily" -o "${dist}" = "xenial"  ]; then
+    gcc_variant=-5
+elif [ "${dist}" = "yakkety" ]; then
+    gcc_variant=-6
 fi
 
 case ${target_arch} in
@@ -166,6 +170,7 @@
     echo "Using PKG_CONFIG_EXECUTABLE: $PKG_CONFIG_EXECUTABLE"
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DMIR_PLATFORM=${mir_platform} -DMIR_ENABLE_TESTS=${enable_tests}\
+      -DMIR_USE_PRECOMPILED_HEADERS=OFF \
       .. 
 
     make -j${NUM_JOBS} $@
 
=== modified file 'src/platforms/android/include/android_format_conversion-inl.h'
--- src/platforms/android/include/android_format_conversion-inl.h	2016-01-29 08:18:22 +0000
+++ src/platforms/android/include/android_format_conversion-inl.h	2016-08-04 08:52:37 +0000
@@ -20,6 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 
 #include "mir_toolkit/common.h"
+#include <cstddef>  // to fix missing #includes in graphics.h
 #include <system/graphics.h>
 
 namespace mir
 
=== modified file 'src/platforms/android/server/graphic_buffer_allocator.h'
--- src/platforms/android/server/graphic_buffer_allocator.h	2016-05-03 06:55:25 +0000
+++ src/platforms/android/server/graphic_buffer_allocator.h	2016-08-04 08:52:37 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_PLATFORM_ANDROID_GRAPHIC_BUFFER_ALLOCATOR_H_
 #define MIR_PLATFORM_ANDROID_GRAPHIC_BUFFER_ALLOCATOR_H_
 
+#include <cstddef>  // to fix missing #includes in graphics.h from hardware.h
 #include <hardware/hardware.h>
 #include "mir_toolkit/mir_native_buffer.h" 
 
 
=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2016-05-03 06:55:25 +0000
+++ tools/setup-partial-armhf-chroot.sh	2016-08-04 08:52:37 +0000
@@ -109,17 +109,27 @@
         ;;
 esac
 
+# Our chroot is missing the default public keys set up in a real install.
+# So this will provide them and silence the warnings:
+mkdir -p etc/apt
+ln -fs /etc/apt/trusted.gpg etc/apt/trusted.gpg
+
 echo "[General]
 arch=${arch}
 directory=${directory}
 unpack=false
 noauth=true
-bootstrap=Ubuntu ${sources}
-
-[Ubuntu]
-packages=${builddeps}
-source=${source_url}
-suite=${dist}
+bootstrap=ubuntu-main ubuntu-universe ${sources}
+
+[ubuntu-main]
+packages=${builddeps}
+source=${source_url}
+suite=${dist} main
+
+[ubuntu-universe]
+packages=${builddeps}
+source=${source_url}
+suite=${dist} universe
 " > mstrap.conf
 
 sourceid=0