Mir

Merge lp:~cyphermox/mir/armhf-chroot-script-fixes into lp: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:~cyphermox/mir/armhf-chroot-script-fixes
Merge into: lp: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:~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.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
=== modified file 'debian/changelog'
--- debian/changelog 2013-10-30 03:58:07 +0000
+++ debian/changelog 2013-10-31 20:26:05 +0000
@@ -1,9 +1,32 @@
1<<<<<<< TREE
1mir (0.1.1-0ubuntu1) UNRELEASED; urgency=low2mir (0.1.1-0ubuntu1) UNRELEASED; urgency=low
23
3 * Bump version to 0.1.14 * Bump version to 0.1.1
45
5 -- Daniel van Vugt <daniel.van.vugt@canonical.com> Wed, 30 Oct 2013 11:46:13 +08006 -- Daniel van Vugt <daniel.van.vugt@canonical.com> Wed, 30 Oct 2013 11:46:13 +0800
67
8=======
9mir (0.1.0+14.04.20131030-0ubuntu1) trusty; urgency=low
10
11 [ Ubuntu daily release ]
12 * New rebuild forced
13
14 [ Alan Griffiths ]
15 * client: Remove the timeout for detecting server crashes There are
16 valid cases when the server blocks for an indeterminate amount of
17 time during a client request, like when a next_buffer request blocks
18 because a surface is not visible or the server is paused. In such
19 cases, the timeout mechanism we used to detect server crashes caused
20 the clients to fail. Furthermore, the clients seem able to detect
21 server crashes without the timeout, rendering it needless anyway.
22 (LP: #1245958)
23
24 [ Ubuntu daily release ]
25 * Automatic snapshot from revision 1163
26
27 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 30 Oct 2013 18:37:21 +0000
28
29>>>>>>> MERGE-SOURCE
7mir (0.1.0+14.04.20131028-0ubuntu1) trusty; urgency=low30mir (0.1.0+14.04.20131028-0ubuntu1) trusty; urgency=low
831
9 [ Daniel van Vugt ]32 [ Daniel van Vugt ]
1033
=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh 2013-10-31 03:04:42 +0000
+++ tools/setup-partial-armhf-chroot.sh 2013-10-31 20:26:05 +0000
@@ -89,7 +89,7 @@
89 libxkbcommon089 libxkbcommon0
90 libxkbcommon-dev90 libxkbcommon-dev
91 libumockdev-dev91 libumockdev-dev
92 liblttng-ust092 liblttng-ust2
93 liburcu193 liburcu1
94 libuuid194 libuuid1
95 liblttng-ust-dev95 liblttng-ust-dev

Subscribers

People subscribed via source and target branches