Mir

Merge lp://qastaging/~cyphermox/mir/armhf-chroot-script-fixes into lp://qastaging/mir

  1. armhf-chroot-script-fixes
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Rejected
Rejected by: Daniel van Vugt
Proposed branch: lp://qastaging/~cyphermox/mir/armhf-chroot-script-fixes
Merge into: lp://qastaging/mir
Diff against target: 49 lines (+24/-1) (has conflicts)
2 files modified
debian/changelog (+23/-0)
tools/setup-partial-armhf-chroot.sh (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://qastaging/~cyphermox/mir/armhf-chroot-script-fixes
Reviewer Review Type Date Requested Status
Daniel van Vugt Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Kevin DuBois Pending
Review via email: mp+193493@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2013-10-31.

Description of the change

Fix the armhf chroot setup script to point to the right library.

This is a temporary step, the script itself should really be removed or fixed to not hardcode package names, or at least use debian/control instead.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote : Posted in a previous version of this proposal

good, lets see what jenkins says

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1165
http://jenkins.qa.ubuntu.com/job/mir-ci/1611/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/80
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/78/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1611/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote : Posted in a previous version of this proposal

retargetting to dev branch

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

FAILED: Continuous integration, rev:1165
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/~mathieu-tl/mir/armhf-chroot-script-fixes/+merge/193493/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/308/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/37/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/308/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Missing commit message and...

Text conflict in debian/changelog
1 conflicts encountered.

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Superseded by lp:~mir-team/mir/fix-1246975

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches