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

[Daniel van Vugt]

Restore support for arm64 (and other architectures) cross compilation
(LP: #1510778). It was introduced and worked fine in r2907 but got
broken in r2914 and further in r2955. So although we announced it as
part of Mir 0.16.0, it was already broken prior to release.

Turns out it only ever worked fully for 2 days in September...
  r2907: 2015-09-08: Added generic cross compilation support for
                     arbitrary architectures including arm64.
  r2914: 2015-09-10: setup-partial-armhf-chroot.sh got broken and
                     became hard-coded for armhf.
                     We didn't notice because we had valid ~/.cache
                     contents from testing r2907.
  r2955: 2015-09-22: CMake files got broken also and cross compilation
                     no longer worked even for people with a valid
                     cache.

Prerequisites on your build machine (for example arm64):
Targeting vivid:
  sudo apt-get install g++-4.9-aarch64-linux-gnu gcc-4.9-aarch64-linux-gnu
Otherwise:
  sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
Modify the package names for other architectures...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3059
http://jenkins.qa.ubuntu.com/job/mir-ci/5419/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4609
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/567/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1573
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/567
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4610
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7230
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24633
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/568/console

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

not sure why you care so much about blaming particular changes.. but the hard coding to armhf was added in r2907 already.

Needs Fixing:
if (MIR_TEST_PLATFORM STREQUAL "mesa-x11")
should be
if (MIR_BUILD_PALTFORM_MESA_X11)
instead.
Within unit-tests the MIR_TEST_PLATFORM kludge is only needed within certain tests that rely on differences in stubs wrt to NativeBuffer as far as I can tell.

review: Needs Fixing

[Andreas Pokorny (andreas-pokorny)]

oh right I should have removed the old argument parsing back then..

[Daniel van Vugt (vanvugt)]

Yeah the diff of setup-partial-armhf-chroot.sh is misleading. The important bit is not visible (not changed).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3061
http://jenkins.qa.ubuntu.com/job/mir-ci/5433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3594
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4629/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/587/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1587
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1587/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/587
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/587/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4630
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4630/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7250/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24676
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/588/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3062
http://jenkins.qa.ubuntu.com/job/mir-ci/5437/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3600
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4635/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/593/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1591
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1591/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/593
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/593/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4636
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4636/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7256/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24682
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/594/console

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3063
http://jenkins.qa.ubuntu.com/job/mir-ci/5453/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3624
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/617/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1607
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/617
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4660
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4660/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7273/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24721
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/618/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3064
http://jenkins.qa.ubuntu.com/job/mir-ci/5466/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3637
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4672/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/630/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1620
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/630
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4673
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4673/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7285/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24780
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/631/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3065
http://jenkins.qa.ubuntu.com/job/mir-ci/5483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3656
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4691/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/649/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1637
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/649
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4692
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4692/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7302/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24827
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/650/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3066
http://jenkins.qa.ubuntu.com/job/mir-ci/5486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4695
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/653/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1640
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1640/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/653
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4696
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7305
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24833
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/654/console

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'tests/integration-tests/graphics/mesa/CMakeLists.txt'
--- tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-10-08 22:12:59 +0000
+++ tests/integration-tests/graphics/mesa/CMakeLists.txt	2015-11-03 07:24:19 +0000
@@ -1,71 +1,75 @@
-##############################################################################
-# mir_integration_tests_mesa-kms
-##############################################################################
-mir_add_wrapped_executable(
-  mir_integration_tests_mesa-kms
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
-  ${MIR_SERVER_OBJECTS}
-  ${MIR_PLATFORM_OBJECTS}
-  ${MIR_COMMON_OBJECTS}
-  $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
-)
-
-add_dependencies(mir_integration_tests_mesa-kms GMock)
-
-target_link_libraries(
-  mir_integration_tests_mesa-kms
-
-  mir-test-static
-  mir-test-framework-static
-  mir-test-doubles-static
-  mirclient-static
-  mirclientrpc-static
-  mirclientlttng-static
-  mirsharedmesaservercommon-static
-
-  ${PROTOBUF_LITE_LIBRARIES}
-  # Mesa platform dependencies
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
-  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
-)
-
-if (MIR_RUN_INTEGRATION_TESTS)
-  mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-kms)
-endif (MIR_RUN_INTEGRATION_TESTS)
-
-##############################################################################
-# mir_integration_tests_mesa-x11
-##############################################################################
-mir_add_wrapped_executable(
-  mir_integration_tests_mesa-x11
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
-  ${MIR_SERVER_OBJECTS}
-  ${MIR_PLATFORM_OBJECTS}
-  ${MIR_COMMON_OBJECTS}
-  $<TARGET_OBJECTS:mirplatformgraphicsmesax11objects>
-  $<TARGET_OBJECTS:mirplatformservermesax11sharedresources>
-)
-
-add_dependencies(mir_integration_tests_mesa-x11 GMock)
-
-target_link_libraries(
-  mir_integration_tests_mesa-x11
-
-  mir-test-static
-  mir-test-framework-static
-  mir-test-doubles-static
-  mirclient-static
-  mirclientrpc-static
-  mirclientlttng-static
-  mirsharedmesaservercommon-static
-
-  ${PROTOBUF_LITE_LIBRARIES}
-  # Mesa platform dependencies
-  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
-  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
-  X11
-)
-
-if (MIR_RUN_INTEGRATION_TESTS)
-  mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-x11)
-endif (MIR_RUN_INTEGRATION_TESTS)
+if (MIR_BUILD_PLATFORM_MESA_KMS)
+    ##########################################################################
+    # mir_integration_tests_mesa-kms
+    ##########################################################################
+    mir_add_wrapped_executable(
+      mir_integration_tests_mesa-kms
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
+      ${MIR_SERVER_OBJECTS}
+      ${MIR_PLATFORM_OBJECTS}
+      ${MIR_COMMON_OBJECTS}
+      $<TARGET_OBJECTS:mirplatformgraphicsmesakmsobjects>
+    )
+
+    add_dependencies(mir_integration_tests_mesa-kms GMock)
+
+    target_link_libraries(
+      mir_integration_tests_mesa-kms
+    
+      mir-test-static
+      mir-test-framework-static
+      mir-test-doubles-static
+      mirclient-static
+      mirclientrpc-static
+      mirclientlttng-static
+      mirsharedmesaservercommon-static
+
+      ${PROTOBUF_LITE_LIBRARIES}
+      # Mesa platform dependencies
+      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+    )
+
+    if (MIR_RUN_INTEGRATION_TESTS)
+      mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-kms)
+    endif (MIR_RUN_INTEGRATION_TESTS)
+endif()
+
+if (MIR_BUILD_PLATFORM_MESA_X11)
+    ##########################################################################
+    # mir_integration_tests_mesa-x11
+    ##########################################################################
+    mir_add_wrapped_executable(
+      mir_integration_tests_mesa-x11
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_buffer_integration.cpp
+      ${MIR_SERVER_OBJECTS}
+      ${MIR_PLATFORM_OBJECTS}
+      ${MIR_COMMON_OBJECTS}
+      $<TARGET_OBJECTS:mirplatformgraphicsmesax11objects>
+      $<TARGET_OBJECTS:mirplatformservermesax11sharedresources>
+    )
+
+    add_dependencies(mir_integration_tests_mesa-x11 GMock)
+
+    target_link_libraries(
+      mir_integration_tests_mesa-x11
+    
+      mir-test-static
+      mir-test-framework-static
+      mir-test-doubles-static
+      mirclient-static
+      mirclientrpc-static
+      mirclientlttng-static
+      mirsharedmesaservercommon-static
+
+      ${PROTOBUF_LITE_LIBRARIES}
+      # Mesa platform dependencies
+      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
+      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
+      X11
+    )
+
+    if (MIR_RUN_INTEGRATION_TESTS)
+      mir_discover_tests_with_fd_leak_detection(mir_integration_tests_mesa-x11)
+    endif (MIR_RUN_INTEGRATION_TESTS)
+endif()

=== modified file 'tests/unit-tests/input/CMakeLists.txt'
--- tests/unit-tests/input/CMakeLists.txt	2015-10-12 20:51:03 +0000
+++ tests/unit-tests/input/CMakeLists.txt	2015-11-03 07:24:19 +0000
@@ -16,7 +16,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_validator.cpp
 )
 
-if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11")
+if (MIR_BUILD_PLATFORM_MESA_X11)
 list(APPEND UNIT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_platform.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_x11_module.cpp

=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2015-09-09 18:52:28 +0000
+++ tools/setup-partial-armhf-chroot.sh	2015-11-03 07:24:19 +0000
@@ -63,17 +63,12 @@
 fi
 
 directory=${1}
-echo "creating phablet-compatible armhf partial chroot for mir compilation in directory ${directory}"
+echo "creating phablet-compatible $arch partial chroot for mir compilation in directory ${directory}"
 
 if [ ! -d ${directory} ]; then
     mkdir -p ${directory} 
 fi
 
-arch=armhf
-if [ ! -z "$3" ]; then
-    arch=$3
-fi
-
 DEBCONTROL=$(pwd)/../debian/control
 
 pushd ${directory} > /dev/null