Mir

Merge lp:~vanvugt/mir/xcompile-wily into lp:mir

Proposed by Daniel van Vugt on 2015-08-17
Status: Work in progress
Proposed branch: lp:~vanvugt/mir/xcompile-wily
Merge into: lp:mir
Diff against target: 12 lines (+1/-1)
1 file modified
tools/setup-partial-armhf-chroot.sh (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/xcompile-wily
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-08-17
Mir development team 2015-08-17 Pending
Review via email: mp+268183@code.launchpad.net

Commit Message

Use the wily build environment for cross compiling, not vivid.

This also fixes build failures related to the archive transition
to g++-5.

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

Hm. This is almost certainly not going to work, because we're going to be deploying the built packages onto vivid-overlay-imaged makos, right?

Daniel van Vugt (vanvugt) wrote :

Wrong. For future development on mako we should be using devel-proposed (wily) images already.

Daniel van Vugt (vanvugt) wrote :

Although an option to choose vivid or wily would be handy in future

Daniel van Vugt (vanvugt) wrote :

Oh. Except wily phone images are now broken and generally not booting. So we've gone backwards and it's actually more likely now people are testing with vivid images again :P

So maybe xcompiling for vivid is still preferred. And some part of the wily archive transition has somehow broken vivid. We need to figure out now what's broken vivid.

Unmerged revisions

2846. By Daniel van Vugt on 2015-08-17

Use the wily build environment for cross compiling, not vivid.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/setup-partial-armhf-chroot.sh'
2--- tools/setup-partial-armhf-chroot.sh 2015-06-17 05:20:42 +0000
3+++ tools/setup-partial-armhf-chroot.sh 2015-08-17 03:10:48 +0000
4@@ -41,7 +41,7 @@
5 builddeps=$(echo ${builddeps} | sed 's/ /,/g')
6 builddeps=$(echo ${builddeps} | sed -e 's/abi-compliance-checker//g')
7
8-fakeroot debootstrap --include=${builddeps} --arch=armhf --download-only --variant=buildd vivid .
9+fakeroot debootstrap --include=${builddeps} --arch=armhf --download-only --variant=buildd wily .
10
11 # Remove libc libraries that confuse the cross-compiler
12 rm var/cache/apt/archives/libc-dev*.deb

Subscribers

People subscribed via source and target branches