click

Merge lp:~mvo/click/chroot-15.04-multiarch into lp:click

  1. chroot-15.04-multiarch
  2. Merge into trunk
Proposed by Michael Vogt
Status: Superseded
Proposed branch: lp:~mvo/click/chroot-15.04-multiarch
Merge into: lp:click
Diff against target: 31 lines (+13/-0)
2 files modified
click/chroot.py (+7/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~mvo/click/chroot-15.04-multiarch
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
click hackers Pending
Review via email: mp+243492@code.launchpad.net

This proposal has been superseded by a proposal from 2014-12-03.

Description of the change

This branch makes click chroot -a armhf -f ubuntu-sdk-15.04-dev1 work
by adding the oxideqt-codecs-extra (native) package explicitly until
the conflicts: oxideqt-codecs-extra/oxideqt-codecs issue below is sorted
out:
"""
One problem right now is the hard dependency of liboxide on oxideqt-codecs|oxideqt-codecs-extra and (oddly enough) the conflict between them.

I end up in a situation where apt tries to install oxideqt-codecs-extra:armhf and oxideqt-codecs:amd64. They conlict which prevents the install.

The conflict is only relevant for the same arch (i.e.
oxideqt-codecs-extra:armhf and oxideqt-codecs:armhf have filesystem
conflicts but not oxideqt-codecs-extra:armhf and oxideqt-codecs-extra:i386)
"""

To post a comment you must log in.
lp:~mvo/click/chroot-15.04-multiarch updated
549. By Michael Vogt

click/chroot.py: fix url

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:548
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://code.launchpad.net/~mvo/click/chroot-15.04-multiarch/+merge/243492/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-ci/28/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-vivid-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-vivid-armhf-ci/3/console

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

review: Needs Fixing (continuous-integration)
lp:~mvo/click/chroot-15.04-multiarch updated
550. By Michael Vogt

click/chroot.py: we also need the native python3

551. By Michael Vogt

click/chroot.py: add ubuntu-sdk-libs-tools for the native tools like cmake/python

552. By Michael Vogt

pep8

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/chroot.py'
2--- click/chroot.py 2014-11-13 10:20:37 +0000
3+++ click/chroot.py 2014-12-03 07:14:54 +0000
4@@ -171,6 +171,13 @@
5 # the sdk libs
6 "ubuntu-sdk-libs:TARGET",
7 "ubuntu-sdk-libs-dev:TARGET",
8+ # FIXME: this is only available on i386/amd64 currently
9+ # FIXME2: this will be installed but useless on non armhf chroots
10+ "qt5-qmake-arm-linux-gnueabihf",
11+ # FIXME: see https://code.launchpad.net/~mvo/oxide/multi-arch-fixes
12+ # we help the apt resolver here until the
13+ # oxideqt-codecs/oxidec-codecs-extras is sorted
14+ "oxideqt-codecs-extra",
15 ],
16 "ubuntu-core-15.04-dev1": [
17 "ubuntu-core-libs:TARGET",
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2014-11-14 12:29:14 +0000
21+++ debian/changelog 2014-12-03 07:14:54 +0000
22@@ -1,3 +1,9 @@
23+click (0.4.35.1) UNRELEASED; urgency=low
24+
25+ * add qt5-qmake-arm-linux-gnueabihf to chroot (LP: #1393698)
26+
27+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Dec 2014 10:59:49 +0100
28+
29 click (0.4.35) vivid; urgency=low
30
31 [ Michael Vogt ]

Subscribers

People subscribed via source and target branches

to all changes: