Ubuntu
kexec-tools package

Merge lp://staging/~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo into lp://staging/ubuntu/quantal/kexec-tools

  1. Precise (12.04)
  2. lp988512-no-vmcoreinfo
  3. Merge into quantal
Proposed by Louis Bouchard
Status: Merged
Merged at revision: 51
Proposed branch: lp://staging/~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo
Merge into: lp://staging/ubuntu/quantal/kexec-tools
Diff against target: 73 lines (+12/-8) (has conflicts)
3 files modified
debian/changelog (+10/-0)
debian/kdump.init.d (+1/-2)
debian/kdump.initramfs (+1/-6)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+112086@code.staging.launchpad.net

Description of the change

Removal of references to vmcoreinfo, no longer needed after kernel 2.6.24 and not being generated in latest 3.2 kernels due to a bug in makedumpfile

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

The discussion in bug 988512 looks like the kernel team rather wants to change the kernel to produce a vmcoreinfo file again? This would make this MP obsolete. I set it to "work in progress" for now to drop it from the sponsoring queue. Please set to "needs review" if it turns out that it should actually be uploaded, or delete it if it is not relevant any more. Thanks!

review: Needs Information
Revision history for this message
Martin Pitt (pitti) wrote :

As discussed by mail, we should go ahead with this.

review: Approve
lp://staging/~louis/ubuntu/precise/kexec-tools/lp988512-no-vmcoreinfo updated
51. By Louis Bouchard

Added changelog entry

52. By Louis Bouchard

fixed changelog error

Revision history for this message
Adam Stokes (adam-stokes) wrote :

1 === modified file 'debian/changelog'
2 --- debian/changelog 2012-07-17 10:50:17 +0000
3 +++ debian/changelog 2012-08-14 15:26:39 +0000
4 @@ -1,3 +1,4 @@
5 +<<<<<<< TREE
6 kexec-tools (1:2.0.3-1ubuntu1) quantal; urgency=low
7
8 * Merge from Debian (LP: #1020965); remaining changes:
9 @@ -24,6 +25,15 @@
10
11 -- Khalid Aziz <email address hidden> Tue, 31 Jan 2012 09:11:31 -0700
12
13 +=======
14 +kexec-tools (1:2.0.2-3ubuntu4.1) precise-proposed; urgency=low
15 +
16 + * Removed dependency to vmcoreinfo which is no longer required
17 + and no longer part of the kernel package
18 +
19 + -- Louis Bouchard <email address hidden> Tue, 14 Aug 2012 17:14:30 +0200
20 +
21 +>>>>>>> MERGE-SOURCE

That portion of the diff needs to be fixed as it looks like a merge conflict

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