Merge lp:~mvo/click/add-qmake-cross-to-chroot into lp:click/devel
Status: | Needs review |
---|---|
Proposed branch: | lp:~mvo/click/add-qmake-cross-to-chroot |
Merge into: | lp:click/devel |
Diff against target: |
229 lines (+97/-90) 1 file modified
click/chroot.py (+97/-90) |
To merge this branch: | bzr merge lp:~mvo/click/add-qmake-cross-to-chroot |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+242177@code.launchpad.net |
Description of the change
This branch adds "qt5-qmake" to the cross build packages that get installed in the click chroot.
It used by the ubuntu-sdk project but I would still like to install it unconditionally (just like we install pkg-config) to avoid having a special case in the chroot.py code. This is a tradeoff that maybe is wrong, I'm happy to hear more opinions on this.
The downside of doing it like this and not adding 'if self.framework_base == "ubuntu-sdk" and self.target_arch == "armhf"' is that click will no longer be able to create e.g. powerpc chroots because this package is missing there.
Unmerged revisions
- 548. By Michael Vogt
-
Include a cross-qmake in the chroot
This is not entirely ideal as some projects like ubuntu-core do not really
need qmake but its small and we need to have the native qmake for native
build and the cross qmake for cross building so adding it to the
ubuntu-sdk-libs-dev is not feasible. Adding conditional code to chroot.py
would work (if framework == sdk-libs) but I would rather like to avoid
this special case and trade it for slightly increasing the core build
chroot. - 547. By Michael Vogt
-
click/chroot.py: cleanup, sort build_pkgs, use str.format() instead of str.replace()
FAILED: Continuous integration, rev:548 /code.launchpad .net/~mvo/ click/add- qmake-cross- to-chroot/ +merge/ 242177/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ click-devel- ci/120/ jenkins. qa.ubuntu. com/job/ click-devel- vivid-amd64- ci/4/console jenkins. qa.ubuntu. com/job/ click-devel- vivid-armhf- ci/4/console jenkins. qa.ubuntu. com/job/ click-devel- vivid-i386- ci/4/console
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/click- devel-ci/ 120/rebuild
http://