Merge lp:~mir-team/mir/package-arm64-drivers into lp:mir

[Daniel van Vugt]

Attempt to build and package missing arm64 binaries for
the Android platform (LP: #1579866)

Not actually tested on an arm64 system right now. I'm out of time today and can't think off hand how to test it.

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

FAILED: Continuous integration, rev:3597
https://mir-jenkins.ubuntu.com/job/mir-ci/1315/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1542/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1595
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1557
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1557/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1557/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1557/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1557/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/1557
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1557/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1557
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1557/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

sure, lgtm.

Should probably be ran in a ppa builder though. (and would prefer if this landed after re-branching 0.24, if its not needed immediately)

review: Approve

[Łukasz Zemczak (sil2100)]

Builds fine at least - and that's all we need right now.

I did a test-build of the same changes just targeted for lp:mir/ubuntu in a silo (for testing) and arm64 builds succeed. Logs can be found here:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-004/+build/10487430

So a big +1 from me. Could we get this included in the nearest mir release? We want to build a xenial image this week.

review: Approve

[Łukasz Zemczak (sil2100)]

@Kevin We would prefer it to be landed ASAP since it's blocking xenial rootfs builds.

[Kevin DuBois (kdub)]

sure, seems that we should do a 0.23.4 release. 0.24.0 has new features and will take longer to test, so landing independently in 0.23.4 will be the easiest way to go

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

FAILED: Continuous integration, rev:3597
https://mir-jenkins.ubuntu.com/job/mir-ci/1321/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1553/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1606
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1597
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1597
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1597
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1568
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1568/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1568/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1568
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1568/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/1568
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1568/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1568
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1568/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

CI failure was NestedServer failure, think we're okay to TA.

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-07-15 02:11:27 +0000
+++ debian/control	2016-07-19 09:25:35 +0000
@@ -25,8 +25,8 @@
                libprotobuf-dev,
                pkg-config,
                android-headers-23,
-               libhardware-dev [i386 amd64 armhf],
-               libandroid-properties-dev [i386 amd64 armhf],
+               libhardware-dev [i386 amd64 armhf arm64],
+               libandroid-properties-dev [i386 amd64 armhf arm64],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev,
@@ -36,7 +36,7 @@
                libgtest-dev,
                google-mock (>= 1.6.0+svn437),
 # only enable valgrind once it's been tested to work on each architecture:
-               valgrind [amd64 i386 armhf],
+               valgrind [amd64 i386 armhf arm64],
                libglib2.0-dev,
                libfreetype6-dev,
                abi-compliance-checker,
@@ -277,7 +277,7 @@
  Contains a tool for stress testing the Mir display server
 
 Package: mir-android-diagnostics
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64 armhf arm64
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -332,7 +332,7 @@
 
 Package: mir-platform-graphics-android10
 Section: libs
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -388,7 +388,7 @@
 
 Package: mir-client-platform-android5
 Section: libs
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -419,7 +419,7 @@
 
 Package: mir-graphics-drivers-android
 Section: libs
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2016-05-03 06:55:25 +0000
+++ debian/rules	2016-07-19 09:25:35 +0000
@@ -29,7 +29,7 @@
 endif
 
 override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),armhf)
+ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \