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

[Michael Vogt]

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)
"""

[lp:~mvo/click/chroot-15.04-multiarch]

549. By Michael Vogt on 2014-12-03

click/chroot.py: fix url

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:549
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/243493/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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]

550. By Michael Vogt on 2014-12-03

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

551. By Michael Vogt on 2014-12-03

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:551
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/243493/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/126/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/click-devel-vivid-i386-ci/10/console

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

review: Needs Fixing (continuous-integration)

[lp:~mvo/click/chroot-15.04-multiarch]

552. By Michael Vogt on 2014-12-04

pep8

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-12-04 14:50:22 +0000
+++ click/chroot.py	2014-12-04 14:50:22 +0000
@@ -171,9 +171,16 @@
         # the sdk libs
         "ubuntu-sdk-libs:TARGET",
         "ubuntu-sdk-libs-dev:TARGET",
+        # the native build tools
+        "ubuntu-sdk-libs-tools",
         # FIXME: this is only available on i386/amd64 currently
         # FIXME2: this will be installed but useless on non armhf chroots
         "qt5-qmake-arm-linux-gnueabihf",
+        # FIXME: see
+        #  http://pad.lv/~mvo/oxide/crossbuild-friendly/+merge/234093
+        # we help the apt resolver here until the
+        #  oxideqt-codecs/oxidec-codecs-extras is sorted
+        "oxideqt-codecs-extra",
         ],
     "ubuntu-core-15.04-dev1": [
         "ubuntu-core-libs:TARGET",