lp:~ubuntu-branches/ubuntu/precise/kexec-tools/precise-201112060618

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/precise/kexec-tools at revision 44

Ubuntu branches: Pending requested 2011-12-06

Diff: 77 lines (+24/-9) (has conflicts)

2 files modified

debian/changelog (+12/-0)
debian/kdump.initramfs (+12/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By Steve Langasek on 2011-12-01

debian/kdump.initramfs: call /usr/bin/makedumpfile via a chroot command,
so that if makedumpfile is statically linked, we get proper library
resolution. Thanks to Louis Bouchard <email address hidden> for
the patch. LP: #785425.

43. By Colin Watson on 2011-08-30

Only run update-grub if /boot/grub/grub.cfg exists, fixing installation
in chroots (LP: #401405).

42. By Andy Whitcroft on 2011-06-15

Fix FTBS on powerpc due to duplicate defnition of __lshrdi3

41. By Andy Whitcroft on 2011-05-23

* Merge with Debian.
  - Drop DEBIAN.readme taking debian upstream version
  - Drop ubuntu patch arm-higher-initrd-load-addr dpatch as initrd
    locations are now calculated from the current size assuming maximum
    compression of * 4.
  - Remaining changes:
    + Run aclocal during build; build-dep on automake1.9.
    + Add and install kdump init script and initramfs snippet; depend on
      initramfs-tools and call the update-initramfs trigger. Also call
      update-grub after update-initramfs trigger.
    + Default to not kexecing a kernel on boot in the automatically
      generated conffile.
    + --no-undefined is a linker option, not a gcc option.

40. By Matthias Klose on 2011-01-19

--no-undefined is a linker option, not a gcc option.

39. By Jonathan Riddell on 2010-11-23

No change rebuild, LP: #642071

38. By Anders Kaseorg on 2010-08-17

kdump.initramfs: panic if assumptions are not satisfied, instead of
letting the system continue to boot inside the crash kernel. (LP: #600051)

37. By Loïc Minier on 2010-05-22

* Drop debian/commit-templates/patch, unused.
* Drop upgrade snippet for versions older than the lucid one.
* Merge with Debian.
  - Drop dpatch arm-fix-architecture-detection, included in Debian as
    arm_arch dpatch.
  - Remaining changes:
    + Run aclocal during build; build-dep on automake1.9.
    + Add and install kdump init script and initramfs snippet; depend on
      initramfs-tools and call the update-initramfs trigger. Also call
      update-grub after update-initramfs trigger.
    + Default to not kexecing a kernel on boot in the automatically
      generated conffile.
    + Add arm-higher-initrd-load-addr dpatch to bump initrd load offset from
      0x800000 to 0x8000000 since our kernels are so big that they overwrite
      the initrd when they uncompress; fixes kexec initrd support on all ARM
      Ubuntu kernels; LP #568283.

36. By Loïc Minier on 2010-04-22

New dpatch, arm-higher-initrd-load-addr, bump initrd load offset from
0x800000 to 0x8000000 since our kernels are so big that they overwrite the
initrd when they uncompress; fixes kexec initrd support on all ARM Ubuntu
kernels; LP: #568283.

35. By Steve Langasek on 2010-02-18

releasing version 1:2.0.1-1ubuntu2