Merge lp:~vanvugt/mir/fix-1609329 into lp:mir
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3631 |
Proposed branch: | lp:~vanvugt/mir/fix-1609329 |
Merge into: | lp:mir |
Diff against target: |
84 lines (+23/-6) 4 files modified
cross-compile-chroot.sh (+5/-0) src/platforms/android/include/android_format_conversion-inl.h (+1/-0) src/platforms/android/server/graphic_buffer_allocator.h (+1/-0) tools/setup-partial-armhf-chroot.sh (+16/-6) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1609329 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Chris Halse Rogers | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+301996@code.launchpad.net |
Commit message
Fix a few problems that have prevented cross-compile-
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.
FAILED: Continuous integration, rev:3632 /mir-jenkins. ubuntu. com/job/ mir-ci/ 1395/ /mir-jenkins. ubuntu. com/job/ build-mir/ 1695/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/1748 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1739 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1739 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 1739 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1715 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1715/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1715 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1715/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 1715 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 1715/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1715 /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 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1715 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1715/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 1715/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 1395/rebuild
https:/