Merge lp:~mvo/click/chroot-15.04-multiarch into lp:click/devel
Status: | Merged |
---|---|
Merged at revision: | 552 |
Proposed branch: | lp:~mvo/click/chroot-15.04-multiarch |
Merge into: | lp:click/devel |
Prerequisite: | lp:~mvo/click/qt5-qmake-cross-armhf |
Diff against target: |
20 lines (+7/-0) 1 file modified
click/chroot.py (+7/-0) |
To merge this branch: | bzr merge lp:~mvo/click/chroot-15.04-multiarch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
click hackers | Pending | ||
Review via email: mp+243493@code.launchpad.net |
This proposal supersedes a proposal from 2014-12-03.
Description of the change
This branch makes click chroot -a armhf -f ubuntu-
by adding the oxideqt-
the conflicts: oxideqt-
out:
"""
One problem right now is the hard dependency of liboxide on oxideqt-
I end up in a situation where apt tries to install oxideqt-
The conflict is only relevant for the same arch (i.e.
oxideqt-
conflicts but not oxideqt-
"""
FAILED: Continuous integration, rev:549 /code.launchpad .net/~mvo/ click/chroot- 15.04-multiarch /+merge/ 243493/ +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/124/ jenkins. qa.ubuntu. com/job/ click-devel- vivid-amd64- ci/8/console jenkins. qa.ubuntu. com/job/ click-devel- vivid-armhf- ci/8/console jenkins. qa.ubuntu. com/job/ click-devel- vivid-i386- ci/8/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/ 124/rebuild
http://