Please merge kexec-tools 1:2.0.4-1 (main) from debian unstable

[Louis Bouchard]

Need merging

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "debian-merge.debdiff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

[Daniel Holbach (dholbach)]

Seems the patch does not apply cleanly or am I missing something?

daniel@daydream:~/kexec-tools-2.0.3$ patch -p1 < ~/Downloads/ubuntu-merge.debdiff
patching file configure
patching file configure.ac
patching file debian/changelog
patching file debian/control
patching file debian/kdump.init.d
patching file debian/kexec-load.init.d
patching file debian/kexec-tools.postinst
patching file debian/patches/coldreboot.patch
patching file debian/patches/crashdump_warning.patch
patching file debian/patches/debianize.patch
patching file debian/patches/distclean_fix.patch
patching file debian/patches/linker-option.patch
patching file debian/patches/series
patching file debian/patches/update_kexec_manpage.patch
patching file debian/rules
patching file debian/watch
patching file include/config.h
patching file include/image.h
patching file include/kexec-uImage.h
patching file include/x86/x86-linux.h
patching file kdump/Makefile
patching file kexec/arch/arm/crashdump-arm.c
patching file kexec/arch/arm/crashdump-arm.h
patching file kexec/arch/arm/include/arch/options.h
patching file kexec/arch/arm/kexec-arm.h
patching file kexec/arch/arm/kexec-uImage-arm.c
patching file kexec/arch/arm/kexec-zImage-arm.c
patching file kexec/arch/arm/Makefile
patching file kexec/arch/i386/crashdump-x86.c
Hunk #19 FAILED at 1018.
Hunk #20 FAILED at 1035.
Hunk #21 succeeded at 1077 (offset 2 lines).
Hunk #22 succeeded at 1101 (offset 2 lines).
2 out of 22 hunks FAILED -- saving rejects to file kexec/arch/i386/crashdump-x86.c.rej
patching file kexec/arch/i386/include/arch/options.h
patching file kexec/arch/i386/kexec-beoboot-x86.c
patching file kexec/arch/i386/kexec-bzImage.c
patching file kexec/arch/i386/kexec-elf-x86.c
patching file kexec/arch/i386/kexec-multiboot-x86.c
patching file kexec/arch/i386/kexec-x86-common.c
patching file kexec/arch/i386/kexec-x86.h
patching file kexec/arch/i386/x86-linux-setup.c
patching file kexec/arch/i386/x86-linux-setup.h
patching file kexec/arch/ia64/crashdump-ia64.c
patching file kexec/arch/ia64/kexec-elf-ia64.c
patching file kexec/arch/ia64/kexec-ia64.c
patching file kexec/arch/mips/crashdump-mips.c
patching file kexec/arch/mips/kexec-elf-mips.c
patching file kexec/arch/ppc/crashdump-powerpc.c
patching file kexec/arch/ppc/crashdump-powerpc.h
patching file kexec/arch/ppc/fixup_dtb.c
patching file kexec/arch/ppc/fs2dt.c
patching file kexec/arch/ppc/include/arch/options.h
patching file kexec/arch/ppc/include/page.h
patching file kexec/arch/ppc/kexec-dol-ppc.c
patching file kexec/arch/ppc/kexec-elf-ppc.c
patching file kexec/arch/ppc/kexec-ppc.c
patching file kexec/arch/ppc/kexec-uImage-ppc.c
patching file kexec/arch/ppc/libfdt/fdt.c
patching file kexec/arch/ppc/libfdt/fdt.h
patching file kexec/arch/ppc/libfdt/fdt_ro.c
patching file kexec/arch/ppc/libfdt/fdt_rw.c
patching file kexec/arch/ppc/libfdt/fdt_strerror.c
patching file kexec/arch/ppc/libfdt/fdt_sw.c
patching file kexec/arch/ppc/libfdt/fdt_wip.c
patching file kexec/arch/ppc/libfdt/libfdt_env.h
patching file kexec/arch/ppc/libfdt/libfdt.h
patching file kexec/arch/ppc/libfdt/libfdt_internal.h
patching file kexec/arch/ppc/libfdt/Makefile.libfdt
patching file kexec/arch/ppc/libfdt-wrapper.c
pat...

[Louis Bouchard (louis)]

$ pull-debian-source kexec-tools unstable
pull-debian-source: Downloading kexec-tools version 1:2.0.4-1
pull-debian-source: Downloading kexec-tools_2.0.4.orig.tar.gz from ftp.debian.org (0.369 MiB)
pull-debian-source: Downloading kexec-tools_2.0.4-1.debian.tar.gz from ftp.debian.org (0.019 MiB)
dpkg-source: info: extracting kexec-tools in kexec-tools-2.0.4
dpkg-source: info: unpacking kexec-tools_2.0.4.orig.tar.gz
dpkg-source: info: unpacking kexec-tools_2.0.4-1.debian.tar.gz
dpkg-source: info: applying debianize.patch
dpkg-source: info: applying static_binary_warning.patch
dpkg-source: info: applying distclean_fix.patch
dpkg-source: info: applying add_debian_readme.patch
dpkg-source: info: applying coldreboot.patch
dpkg-source: info: applying linker-option.patch
dpkg-source: info: applying kdump_makefile.patch
dpkg-source: info: applying kexec-p-fails-to-load-kernels-with-version-x.y.patch

$ cd kexec-tools-2.0.4/

$ patch -p1 < ../debian-merge.debdiff
patching file debian/changelog
patching file debian/control
patching file debian/kdump.initramfs
patching file debian/kexec-tools.dirs
patching file debian/kexec-tools.grub
patching file debian/kexec-tools.postinst
patching file debian/kexec-tools.templates
patching file debian/rules

Seems to be a better idea to apply the debian-merge.debdiff to the debian source package as the main versions differ

[Chris J Arges (arges)]

sponsored

[Launchpad Janitor (janitor)]

This bug was fixed in the package kexec-tools - 1:2.0.4-1ubuntu1

---------------
kexec-tools (1:2.0.4-1ubuntu1) trusty; urgency=low

  * Merge from Debian unstable (LP: #1271127), remaining changes:
    - Run aclocal during build; build-dep on automake.
    - Implementation of kdump-tools is now completed so the following are
      removed :
        kdump init script and initramfs snippet
        Remove dependancy to initramfs-tools and makedumpfile
        Remove Depend on makedumpfile (on appropriate architectures)
    - Call to update-grub to update boot args with crashkernel=
    - Default to not kexecing a kernel on boot in the automatically
      generated conffile (claimed to be fixed in Debian but isn't).
    - Don't call db_stop from the postinst.

kexec-tools (1:2.0.4-1) unstable; urgency=low

  * New upstream release
  * Removed crashdump_warning.patch since it is in upstream now
  * Removed update_kexec_manpage.patch since it is in upstream now
  * Updated watch file to look for more extensions that tgz and tar.gz, as
    suggested by someone on PTS
  * Added support for parallel make (closes: Bug#727130)
  * Added support for grub2's saved_entry (closes: Bug#699007)
 -- Louis Bouchard <email address hidden> Tue, 21 Jan 2014 11:29:40 +0100