diff -Nru kexec-tools-2.0.3/debian/changelog kexec-tools-2.0.3/debian/changelog --- kexec-tools-2.0.3/debian/changelog 2012-01-31 17:11:44.000000000 +0100 +++ kexec-tools-2.0.3/debian/changelog 2012-07-04 15:42:15.000000000 +0200 @@ -1,3 +1,20 @@ +kexec-tools (1:2.0.3-1ubuntu1) quantal-proposed; urgency=low + + * Merge with debian; Remaining changes: + - Fix FTBFS on powerpc due to duplicate defnition of __lshrdi3. + - Only run update-grub if /boot/grub/grub.cfg exists, fixing installation + in chroots. + - 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. + - Only install the kdump initramfs script and depend on makedumpfile on + architectures that makedumpfile supports. + + -- Stefan Bader Wed, 04 Jul 2012 15:21:02 +0200 + kexec-tools (1:2.0.3-1) unstable; urgency=low * New upstream release @@ -7,6 +24,49 @@ -- Khalid Aziz Tue, 31 Jan 2012 09:11:31 -0700 +kexec-tools (1:2.0.2-3ubuntu4) precise; urgency=low + + * Build kexec-tools-udeb for armhf as well. + + -- Colin Watson Sat, 21 Apr 2012 01:07:21 +0100 + +kexec-tools (1:2.0.2-3ubuntu3) precise; urgency=low + + * Fix an unnecessary bashism. + * Only install the kdump initramfs script and depend on makedumpfile on + architectures that makedumpfile supports. + + -- Colin Watson Tue, 03 Jan 2012 10:24:16 +0000 + +kexec-tools (1:2.0.2-3ubuntu2) precise; urgency=low + + * debian/kdump.initramfs: call /usr/bin/makedumpfile via a chroot command, + so that if makedumpfile is dynamically linked, we get proper library + resolution. Thanks to Louis Bouchard for + the patch. LP: #785425. + * debian/kdump.initramfs: handle the possibility that /usr, /boot, or + /var is on a separate filesystem and needs to be manually mounted before + calling makedumpfile. LP: #828731. + * Depend on makedumpfile, without which the initramfs script doesn't work. + + -- Steve Langasek Mon, 02 Jan 2012 22:43:33 -0800 + +kexec-tools (1:2.0.2-3ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - Fix FTBFS on powerpc due to duplicate defnition of __lshrdi3. + - Only run update-grub if /boot/grub/grub.cfg exists, fixing installation + in chroots. + - 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. + * Build for armhf. + + -- Matthias Klose Mon, 05 Dec 2011 15:45:25 +0100 + kexec-tools (1:2.0.2-3) unstable; urgency=low * Added check for link_in_boot in kernel-img.conf and update kexec @@ -48,6 +108,37 @@ -- Khalid Aziz Sun, 31 Jul 2011 14:30:31 -0600 +kexec-tools (1:2.0.2-1ubuntu3) oneiric; urgency=low + + * Only run update-grub if /boot/grub/grub.cfg exists, fixing installation + in chroots (LP: #401405). + + -- Colin Watson Tue, 30 Aug 2011 13:30:21 +0100 + +kexec-tools (1:2.0.2-1ubuntu2) oneiric; urgency=low + + * Fix FTBS on powerpc due to duplicate defnition of __lshrdi3 + + -- Andy Whitcroft Wed, 15 Jun 2011 15:11:54 +0100 + +kexec-tools (1:2.0.2-1ubuntu1) oneiric; urgency=low + + * 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. + + -- Andy Whitcroft Mon, 23 May 2011 11:23:37 +0100 + kexec-tools (1:2.0.2-1) unstable; urgency=low * New upstream release (closes: Bug#623814) @@ -74,6 +165,46 @@ -- Khalid Aziz Mon, 09 Aug 2010 14:41:14 -0600 +kexec-tools (1:2.0.1-2ubuntu4) natty; urgency=low + + * --no-undefined is a linker option, not a gcc option. + + -- Matthias Klose Wed, 19 Jan 2011 05:30:44 +0100 + +kexec-tools (1:2.0.1-2ubuntu3) natty; urgency=low + + * No change rebuild, LP: #642071 + + -- Jonathan Riddell Tue, 23 Nov 2010 02:10:41 +0000 + +kexec-tools (1:2.0.1-2ubuntu2) maverick; urgency=low + + * kdump.initramfs: panic if assumptions are not satisfied, instead of + letting the system continue to boot inside the crash kernel. (LP: #600051) + + -- Anders Kaseorg Tue, 17 Aug 2010 02:18:48 +0200 + +kexec-tools (1:2.0.1-2ubuntu1) maverick; urgency=low + + * 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. + + -- Loïc Minier Sat, 22 May 2010 22:13:09 +0200 + kexec-tools (1:2.0.1-2) unstable; urgency=low * Fixed kernel load failure on "armv5tel" architecture (closes: Bug#564648) @@ -84,6 +215,38 @@ -- Khalid Aziz Thu, 22 Apr 2010 16:03:31 -0600 +kexec-tools (1:2.0.1-1ubuntu3) lucid; urgency=low + + * 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. + + -- Loïc Minier Thu, 22 Apr 2010 14:06:08 +0200 + +kexec-tools (1:2.0.1-1ubuntu2) lucid; urgency=low + + * Don't call db_stop in the postinst; this is not what it's for, and it + causes update-grub to break on Ubuntu by killing the frontend that child + processes expect to talk to. LP: #518853. + + -- Steve Langasek Wed, 17 Feb 2010 23:04:30 -0800 + +kexec-tools (1:2.0.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian; replace arm-getpagesize-unistd and configure_syntax + dpatches to use their Debian equivalents; remaining changes: + - Run aclocal; 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-grup after update-initramfs trigger. + - Default to not kexecing a kernel on boot in the automatically generated + conffile; also disable this on upgrades from older versions. + - Fix architecture detection on ARM, cherry-picked from upstream. + * Build-dep on automake instead of automake1.9. + + -- Loïc Minier Mon, 08 Feb 2010 10:53:24 +0100 + kexecc-tools (1:2.0.1-1) unstable; urgency=low * New upstream version @@ -92,6 +255,43 @@ -- Khalid Aziz Tue, 24 Nov 2009 08:55:05 -0700 +kexec-tools (1:2.0.1-0ubuntu4) lucid; urgency=low + + * New dpatch, arm-getpagesize-unistd, cherry pick from upstream "arm: + Include unistd.h for getpagesize()" + c986de289120d449bf4d94c46c676566ccfd4202 to fix build issue on armel + breaking the binaries. + + -- Loïc Minier Sun, 07 Feb 2010 22:16:39 +0100 + +kexec-tools (1:2.0.1-0ubuntu3) lucid; urgency=low + + * New dpatch, arm-fix-architecture-detection, cherry-pick second hunk of + upstream commit "arm: fix architecture detection" + 5545216da4360d6494cc7ba574e04620a826a332. Fixes support for arm* utsnames + in particular armv7l. + + -- Loïc Minier Sun, 07 Feb 2010 21:52:30 +0100 + +kexec-tools (1:2.0.1-0ubuntu2) lucid; urgency=low + + * Re-add automake1.9 build-dep since we still patch configure.ac and this + triggers an autoreconf. (Upstream doesn't use AM_MAINTAINER_MODE.) + + -- Loïc Minier Sun, 07 Feb 2010 21:25:19 +0100 + +kexec-tools (1:2.0.1-0ubuntu1) lucid; urgency=low + + * New upstream release. + - Switch to non-native packaging and upstream tarball; drop automake1.9 + build-dep. NB: This is the Debian tarball which has been repacked by + the Debian maintainer, but the contents are identical to the upstream + tarball. Picking the Debian tarball should make it easier to resync + with Debian if we stick with 2.0.1 for a while. + - Drop arm_build dpatch, fixed differently upstream. + + -- Loïc Minier Sun, 07 Feb 2010 20:39:48 +0100 + kexec-tools (1:2.0.0-2) unstable; urgency=low * Fixed configure script failure (closes: Bug#543081) @@ -109,6 +309,117 @@ -- Khalid Aziz Wed, 15 Apr 2009 16:41:45 -0600 +kexec-tools (20090000-2.0.0ubuntu12) karmic; urgency=low + + * debian/patches/configure_syntax.dpatch: Put semicolons before 'fi', or + else configure breaks. + + -- Colin Watson Wed, 07 Oct 2009 00:15:18 +0100 + +kexec-tools (20090000-2.0.0ubuntu11) karmic; urgency=low + + * Don't call db_stop in postinst as update-grub calls into debconf; thanks + Colin Watson; LP: #400397. + + -- Loïc Minier Thu, 16 Jul 2009 23:05:51 +0200 + +kexec-tools (20090000-2.0.0ubuntu10) karmic; urgency=low + + * debian/kexec-tools.postinst: + - run update-grub explicitely instead of using the trigger, + grub2 does not have one (see debian #481542) + + -- Michael Vogt Thu, 16 Jul 2009 10:42:03 +0200 + +kexec-tools (20090000-2.0.0ubuntu9) karmic; urgency=low + + * debian/kdump.init.d: + - generate crash file from vmcore on first boot automatically + + -- Michael Vogt Tue, 23 Jun 2009 10:59:14 +0200 + +kexec-tools (20090000-2.0.0ubuntu8) karmic; urgency=low + + * debian/kdump.initramfs: + - use ELF format for the vmcore file. "crash" did not produce + a backtrace with the kdump-compressed format + + -- Michael Vogt Mon, 22 Jun 2009 17:23:45 +0200 + +kexec-tools (20090000-2.0.0ubuntu7) karmic; urgency=low + + * debian/kdump.initramfs: + - dump the kernel crash info to /var/crash/vmcore-$KVER + + -- Michael Vogt Mon, 22 Jun 2009 15:42:24 +0200 + +kexec-tools (20090000-2.0.0ubuntu6) karmic; urgency=low + + * debian/kexec-tools.template + - set "kexec-tools/load_kexec" to "false" by default + * debian/kexec-tools.postinst: + - trigger update-grub and update-initramfstools to ensure + the kdump functionality is availabe on next reboot + + -- Michael Vogt Mon, 22 Jun 2009 14:40:18 +0200 + +kexec-tools (20090000-2.0.0ubuntu5) karmic; urgency=low + + * debian policy forbids dpkg conffile handling and maintainer script + configuration in the same package as this leads to inconsistant behaviour + between apt-get install and dpkg -i installs of the same package. Switch + wholy to the maintainer script. LP: #368745 + * kexec reboot has been enabled by default whereas it should have been + opt-in, it is therefore appropriate to force this off for upgrades from + older versions. LP: #251242 + + -- Andy Whitcroft Tue, 28 Apr 2009 19:21:30 +0100 + +kexec-tools (20090000-2.0.0ubuntu4) karmic; urgency=low + + * kexec based reboot triggers a number of semantic changes which + are visible to the user, it should be opt-in by default. Adjust + kexec.default to disable kexec by default. LP: #251242 + + -- Andy Whitcroft Mon, 27 Apr 2009 10:32:46 +0100 + +kexec-tools (20090000-2.0.0ubuntu3) jaunty; urgency=low + + * Somehow lost the installation of /etc/init.d/kdump, without + which nothing really works + + -- Tim Gardner Wed, 25 Mar 2009 19:59:28 +0000 + +kexec-tools (20090000-2.0.0ubuntu2) jaunty; urgency=low + + * Install 0_kdump into initramfs scripts + * Depend on initramfs-tools + + -- Tim Gardner Wed, 04 Mar 2009 19:08:15 +0000 + +kexec-tools (20090000-2.0.0ubuntu1) jaunty; urgency=low + + [ Tim Gardner ] + + * Updated to kexec-tools v2.0.0 from kexec-20080324-2.1 at + git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git. + + Update steps: + Removed debian/patches/update_kexec_manpage.dpatch + Updated debian/patches/distclean_fix.dpatch + Removed obsolete debian/patches/powerpc_fix.dpatch + debian/rules: Run aclocal, autoheader, and autoconf if configure does not exist. + + Try to forget 20080226-2.0.0-ubuntu1 ever existed. This version was updated directly + from 20080324-2.1 and completely obsoletes 20080226-2.0.0-ubuntu1. + + [ Jim Lieb ] + + * Fix rules to handle updated package makefile+autotools + package build now depends on autotools1.9 + + -- Tim Gardner Tue, 03 Mar 2009 20:22:14 +0000 + kexec-tools (20080324-2.1) unstable; urgency=low * Porter NMU. @@ -171,6 +482,26 @@ -- Khalid Aziz Thu, 28 Feb 2008 14:19:40 -0700 +kexec-tools (20080226-2.0.0-ubuntu1) jaunty; urgency=low + + [ Jim Lieb ] + + * Update to 2.0.0 official release to include later kernels and fixes + for x86_64 etc. Drop all patches except debianize which is reworked to + contain all of the debian packaging specifics. + * Fix rules to handle updated package makefile+autotools + package build now depends on autotools1.9 + * Update copyright and other bits that lintian complains about + + [ Tim Gardner ] + + * Messed with debian/rules to make it a bit more sane in its use of dpatch. + * Add rsync as a build dependency. + * Fixed some path issues in debian/kdump.initramfs. makedumpfile seems to have + changed locations. + + -- Tim Gardner Thu, 19 Feb 2009 10:56:59 -0800 + kexec-tools (20070330-4) unstable; urgency=low * Added another condition around strip command to address build failure on diff -Nru kexec-tools-2.0.3/debian/control kexec-tools-2.0.3/debian/control --- kexec-tools-2.0.3/debian/control 2012-01-31 17:11:03.000000000 +0100 +++ kexec-tools-2.0.3/debian/control 2012-07-04 14:57:23.000000000 +0200 @@ -2,13 +2,14 @@ Section: admin Homepage: http://kernel.org/pub/linux/utils/kernel/kexec/ Priority: optional -Maintainer: Khalid Aziz -Build-Depends: debhelper (>= 7.0.0), autoconf, gnu-efi (>=3.0a-4)[ia64], libz-dev[ia64], po-debconf +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Khalid Aziz +Build-Depends: debhelper (>= 7.0.0), autoconf, gnu-efi (>=3.0a-4)[ia64], libz-dev[ia64], po-debconf, automake Standards-Version: 3.9.2 Package: kexec-tools Architecture: i386 amd64 ppc64 powerpc ia64 s390 arm armel armhf sh4 -Depends: ${shlibs:Depends}, ${misc:Depends}, debconf +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, initramfs-tools, makedumpfile [i386 amd64 powerpc ia64] Description: tools to support fast kexec reboots This package provides tools to load a kernel into memory and then "reboot" directly into that kernel using the kexec system call, diff -Nru kexec-tools-2.0.3/debian/kdump.init.d kexec-tools-2.0.3/debian/kdump.init.d --- kexec-tools-2.0.3/debian/kdump.init.d 1970-01-01 01:00:00.000000000 +0100 +++ kexec-tools-2.0.3/debian/kdump.init.d 2012-07-04 15:25:33.000000000 +0200 @@ -0,0 +1,84 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: kdump +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Should-Start: +# Should-Stop: +# Default-Start: 0 1 2 3 4 5 +# Default-Stop: 6 +# Short-Description: Load crashkernel image with kexec +# Description: +### END INIT INFO + +PATH=/usr/sbin:/usr/bin:/sbin:/bin + +. /lib/lsb/init-functions + +KVER="`uname -r`" +KERNEL_IMAGE="/boot/vmlinuz-$KVER" +INITRD="/boot/initrd.img-$KVER" +VMCORE="/boot/vmcoreinfo-$KVER" + +# Without makedumpfile, there will be no vmcore on crash, so no point +test -x /usr/bin/makedumpfile || exit 0 +if [ ! -e "$VMCORE" -o ! -e "$KERNEL_IMAGE" -o ! -e "$INITRD" ]; then + exit 0; +fi + + +do_start () { + test -x /sbin/kexec || exit 0 + + # We have to be booted with crashkernel= to work. See + # /boot/grub/menu.lst + grep -q crashkernel= /proc/cmdline || exit 0 + + # Remove crashkernel, vga, video and splash options + APPEND="" + for x in `cat /proc/cmdline`; do + case $x in + splash*|vga*|video*|crashkernel*|quiet) + ;; + *) + APPEND="$APPEND $x" + ;; + esac + done + + # Append kdump_needed for initramfs to know what to do, and add + # maxcpus=1 to keep things sane. + APPEND="$APPEND kdump_needed maxcpus=1 irqpoll reset_devices" + + # --elf32-core-headers is needed for 32-bit systems (ok + # for 64-bit ones too). + log_action_begin_msg "Loading crashkernel" + kexec -p "$KERNEL_IMAGE" --initrd="$INITRD" --append="$APPEND" + log_action_end_msg $? +} + +run_apport_on_vmcore() +{ + if [ -e /var/crash/vmcore -a -x /usr/share/apport/kernel_crashdump ]; then + /usr/share/apport/kernel_crashdump || true + fi +} + +case "$1" in + start) + run_apport_on_vmcore + do_start + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: $0 start|stop" >&2 + exit 3 + ;; +esac +exit 0 diff -Nru kexec-tools-2.0.3/debian/kdump.initramfs kexec-tools-2.0.3/debian/kdump.initramfs --- kexec-tools-2.0.3/debian/kdump.initramfs 1970-01-01 01:00:00.000000000 +0100 +++ kexec-tools-2.0.3/debian/kdump.initramfs 2012-07-04 15:25:33.000000000 +0200 @@ -0,0 +1,83 @@ +#!/bin/sh + +PREREQ="" +prereqs() +{ + echo "$PREREQ" +} +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +KVER="`uname -r`" +INFO="/boot/vmcoreinfo-$KVER" +CRASHFILE="/var/crash/vmcore" +MAKEDUMPFILE="/usr/bin/makedumpfile" +LOG="$rootmnt/var/crash/vmcore.log" +VMCORE="/proc/vmcore" + +# Check that this is a kexec kernel. +grep -q kdump_needed /proc/cmdline || exit 0 + +# Do NOT exit the script after this point, or the system will start +# booting inside the crash kernel. + +. ./scripts/functions + +# Unconditionally mount /dev in the target, in case it's needed. +mount -n --bind /dev ${rootmnt}/dev + +# Check if any additional filesystems need to be mounted in order to run +# makedumpfile +# We assume that the system rootfs is now mounted on ${rootmnt} +for target in /usr /boot /var +do + # We write to /var; everything else should be mounted ro + if [ "$target" = /var ]; then + opts= + else + opts=-oro + fi + if [ -n "$(awk '$2 == "'$target'" { print $2 }' ${rootmnt}/etc/fstab)" ] + then + chroot ${rootmnt} mount -n $opts $target + mounted="$target $mounted" + fi +done + +# Make sure makedumpfile assumptions are satisfied. +while ! test -e "$rootmnt/$INFO"; do + panic "kdump: Missing $INFO" +done + +while ! test -x "$rootmnt/$MAKEDUMPFILE"; do + panic "kdump: Missing $rootmnt/$MAKEDUMPFILE" +done + +log_begin_msg "Saving vmcore from kernel crash" + +mount $rootmnt -o remount,rw + +mount -n --bind /proc $rootmnt/proc + +# Delete it if the copy fails, mainly to keep from filling up filesystems +# by accident. +# +chroot $rootmnt $MAKEDUMPFILE -E -d 31 -i $INFO $VMCORE $CRASHFILE > $LOG 2>&1 || \ + rm -f $rootmnt/$CRASHFILE + +chmod 400 $rootmnt/$CRASHFILE + +# Unmount any extra filesystems we had to mount +for target in $mounted; do + umount -n ${rootmnt}$target +done + +mount $rootmnt -o remount,ro +reboot + +log_end_msg diff -Nru kexec-tools-2.0.3/debian/kexec-tools.postinst kexec-tools-2.0.3/debian/kexec-tools.postinst --- kexec-tools-2.0.3/debian/kexec-tools.postinst 2012-01-19 19:59:26.000000000 +0100 +++ kexec-tools-2.0.3/debian/kexec-tools.postinst 2012-07-04 14:53:41.000000000 +0200 @@ -69,7 +69,7 @@ # sourced by /etc/init.d/kexec and /etc/init.d/kexec-load # Load a kexec kernel (true/false) -LOAD_KEXEC=true +LOAD_KEXEC=false # Kernel and initrd image KERNEL_IMAGE="/vmlinuz" @@ -110,7 +110,7 @@ # ------------------------- Debconf questions start --------------------- -db_get kexec-tools/load_kexec || RET=true +db_get kexec-tools/load_kexec || RET=false new_LOAD_KEXEC="${RET}" update_param LOAD_KEXEC @@ -127,6 +127,14 @@ # ------------------------- Debconf questions end --------------------- +dpkg-trigger update-initramfs + +# no triggers in grub2, +# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481542 +if [ -x /usr/sbin/update-grub ] && [ -e /boot/grub/grub.cfg ]; then + update-grub +fi + #DEBHELPER# exit 0 diff -Nru kexec-tools-2.0.3/debian/kexec-tools.templates kexec-tools-2.0.3/debian/kexec-tools.templates --- kexec-tools-2.0.3/debian/kexec-tools.templates 2012-01-19 19:59:26.000000000 +0100 +++ kexec-tools-2.0.3/debian/kexec-tools.templates 2012-07-04 14:44:37.000000000 +0200 @@ -9,7 +9,7 @@ Template: kexec-tools/load_kexec Type: boolean -Default: true +Default: false _Description: Should kexec-tools handle reboots? If you choose this option, a system reboot will trigger a restart into a kernel loaded by kexec instead of going through the full diff -Nru kexec-tools-2.0.3/debian/patches/00list kexec-tools-2.0.3/debian/patches/00list --- kexec-tools-2.0.3/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 +++ kexec-tools-2.0.3/debian/patches/00list 2012-07-04 15:23:11.000000000 +0200 @@ -0,0 +1 @@ +ubuntu-ppc-__lshrdi3-ftbs.dpatch diff -Nru kexec-tools-2.0.3/debian/patches/ubuntu-ppc-__lshrdi3-ftbs.dpatch kexec-tools-2.0.3/debian/patches/ubuntu-ppc-__lshrdi3-ftbs.dpatch --- kexec-tools-2.0.3/debian/patches/ubuntu-ppc-__lshrdi3-ftbs.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ kexec-tools-2.0.3/debian/patches/ubuntu-ppc-__lshrdi3-ftbs.dpatch 2012-07-04 15:24:05.000000000 +0200 @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu-ppc-__lshrdi3-ftbs.dpatch by Andy Whitcroft +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: disable duplicate __lshrdi3 definition to fix FTBS on powerpc + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ubuntu~/purgatory/arch/ppc/misc.S ubuntu/purgatory/arch/ppc/misc.S +--- ubuntu~/purgatory/arch/ppc/misc.S 2011-05-25 20:13:23.000000000 +0100 ++++ ubuntu/purgatory/arch/ppc/misc.S 2011-06-15 10:19:01.000000000 +0100 +@@ -58,6 +58,7 @@ + or r3,r3,r7 # MSW |= t2 + blr + ++#if 0 + .globl __lshrdi3 + __lshrdi3: + subfic r6,r5,32 +@@ -69,4 +70,4 @@ + srw r3,r3,r5 # MSW = MSW >> count + or r4,r4,r7 # LSW |= t2 + blr +- ++#endif diff -Nru kexec-tools-2.0.3/debian/README.debian kexec-tools-2.0.3/debian/README.debian --- kexec-tools-2.0.3/debian/README.debian 2012-01-19 19:59:26.000000000 +0100 +++ kexec-tools-2.0.3/debian/README.debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -This kexec-tools package was built from kexec-tools git repository at -. - -Installing this package also installs two init scripts under /etc/init.d - -kexec-load and kexec. kexec-load is called upon reboot to load a new kexec -kernel if kexec is enabled in /etc/default/kexec. kexec script is called -just before reboot script. It checks if kexec is enabled and a -kexec'able kernel is loaded. If yes, it kexecs a new kernel instead of -reboot. As a result, kexec is automatically enabled upon installation of -kexec-tools package if kexec is enabled in /etc/default/kexec through debconf -option. diff -Nru kexec-tools-2.0.3/debian/rules kexec-tools-2.0.3/debian/rules --- kexec-tools-2.0.3/debian/rules 2012-01-30 18:26:49.000000000 +0100 +++ kexec-tools-2.0.3/debian/rules 2012-07-04 14:49:41.000000000 +0200 @@ -19,10 +19,13 @@ CFLAGS += -O2 endif +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. + aclocal -I config autoheader autoconf ./configure --prefix=/usr --sbindir=/sbin --mandir=/usr/share/man --datadir=/usr/share @@ -64,6 +67,10 @@ # Add here commands to install the package into debian/tmp. $(MAKE) install DESTDIR=$(CURDIR)/debian/kexec-tools +ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64 powerpc ia64)) + install -D -m755 debian/kdump.initramfs \ + debian/kexec-tools/usr/share/initramfs-tools/scripts/init-bottom/0_kdump +endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) [ ! -f $(CURDIR)/debian/kexec-tools/usr/lib/kexec-tools-testing/kexec_test.static ] || strip $(CURDIR)/debian/kexec-tools/usr/lib/kexec-tools-testing/kexec_test.static endif @@ -83,6 +90,7 @@ dh_installdebconf dh_installinit --no-start -r --name=kexec -- start 85 6 . dh_installinit --no-start -r --name=kexec-load -- stop 18 6 . + dh_installinit --no-start -r --name=kdump -- start 00 2 . dh_installexamples dh_lintian dh_install