Merge ~kevinbecker/ubuntu/+source/kexec-tools:merge-lp2139722-resolute into ubuntu/+source/kexec-tools:debian/sid

[Kevin Becker]

Merge 2.0.32-3 with 2.0.31-1ubuntu2 ( https://bugs.launchpad.net/ubuntu/+source/kexec-tools/+bug/2139722 )

PPA: https://launchpad.net/~kevinbecker/+archive/ubuntu/kexec-tools-resolute

[John Chittum (jchittum)]

LGTM! Thanks! now to get an actual sponsor to review and upload :)

review: Approve

[Kevin Becker (kevinbecker)]

Testing info:

Attempted to run autopkgtest via:

autopkgtest --apt-upgrade --shell-fail --apt-pocket=proposed --add-apt-source="ppa:kevinbecker/kexec-tools-resolute" --no-built-binaries kexec-tools -- lxd --vm ubuntu-daily:resolute

but there's no tests there. Results:

-----
autopkgtest [14:55:24]: testing package kexec-tools version 1:2.0.32-3ubuntu1
autopkgtest [14:55:24]: build not needed
* SKIP no tests in this package
autopkgtest [14:55:25]: @@@@@@@@@@@@@@@@@@@@ summary
* SKIP no tests in this package
-----

I also ran a kdump test after upgrading to the new package on resolute:

# echo c > /proc/sysrq-trigger

This reboots the system, using kexec to boot the crash dump capture kernel.
After reboot, confirm that the crash dump files are in /var/crash

$ ls -R /var/crash
/var/crash:
202602031547 kexec_cmd
kdump_lock linux-image-6.18.0-9-generic-202602031547.crash

/var/crash/202602031547:
dmesg.202602031547 dump.202602031547

Then confirm that gdb loads the crashdump successfully.

$ crash /usr/lib/debug/boot/vmlinux-6.18.0-9-generic /var/crash/202602031547/dump.202602031547

crash 8.0.6

<skip copyright and license info>

warning: Section .debug_names in /usr/lib/debug/boot/vmlinux-6.18.0-9-generic length 130044 does not match section length 453964, ignoring .debug_names.

      KERNEL: /usr/lib/debug/boot/vmlinux-6.18.0-9-generic
    DUMPFILE: /var/crash/202602031547/dump.202602031547 [PARTIAL DUMP]
        CPUS: 4
        DATE: Wed Dec 31 19:00:00 EST 1969
      UPTIME: 00:24:42
LOAD AVERAGE: 0.00, 0.00, 0.00
       TASKS: 160
    NODENAME: resolute-kdump
     RELEASE: 6.18.0-9-generic
     VERSION: #9-Ubuntu SMP PREEMPT_DYNAMIC Mon Jan 12 16:49:02 UTC 2026
     MACHINE: x86_64 (2295 Mhz)
      MEMORY: 8 GB
       PANIC: "Kernel panic - not syncing: sysrq triggered crash"
         PID: 1457
     COMMAND: "bash"
        TASK: ffff8effdb75d480 [THREAD_INFO: ffff8effdb75d480]
         CPU: 0
       STATE: TASK_RUNNING (PANIC)

crash> bt
PID: 1457 TASK: ffff8effdb75d480 CPU: 0 COMMAND: "bash"
 #0 [ffffd5b002b73998] machine_kexec at ffffffff947da229
 #1 [ffffd5b002b739d0] __crash_kexec at ffffffff94971aa8
 #2 [ffffd5b002b73a98] vpanic at ffffffff946141f2
 #3 [ffffd5b002b73b28] sysrq_handle_crash at ffffffff953348ba
 #4 [ffffd5b002b73b38] __handle_sysrq.cold at ffffffff946b1d4e
 #5 [ffffd5b002b73b78] write_sysrq_trigger at ffffffff95335a92
 #6 [ffffd5b002b73ba8] proc_reg_write at ffffffff94d68ddd
 #7 [ffffd5b002b73bc0] vfs_write at ffffffff94c9456e
 #8 [ffffd5b002b73c58] ksys_write at ffffffff94c94cf1
 #9 [ffffd5b002b73c98] __x64_sys_write at ffffffff94c94d99
#10 [ffffd5b002b73ca8] x64_sys_call at ffffffff94728b89
#11 [ffffd5b002b73cb8] do_syscall_64 at ffffffff95a58fb1
#12 [ffffd5b002b73f40] entry_SYSCALL_64_after_hwframe at ffffffff9440012b
    RIP: 00007d32ec8a0146 RSP: 00007fff4356ff70 RFLAGS: 00000202
    RAX: ffffffffffffffda RBX: 00007d32eca125c0 RCX: 00007d32ec8a0146
    RDX: 0000000000000002 RSI: 000062b707fe8530 RDI: 0000000000000001
    RBP: 00007fff4356ff80 R8: 0000000000000000 R9: 0000000000000000
    R10: 0000000000000000 R11: 0000000000000202 R12: 00000000000...

[Paride Legovini (paride)]

Looks good, thanks!

Uploading kexec-tools_2.0.32-3ubuntu1.dsc
Uploading kexec-tools_2.0.32-3ubuntu1.debian.tar.xz
Uploading kexec-tools_2.0.32-3ubuntu1_source.buildinfo
Uploading kexec-tools_2.0.32-3ubuntu1_source.changes

review: Approve

[Kevin Becker (kevinbecker)]

Thank you Paride!

diff --git a/debian/changelog b/debian/changelog
index 5d68e42..620c1e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+kexec-tools (1:2.0.32-3ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2139722). Remaining changes:
+    - Add libzstd-dev build dependency for EFI_ZBOOT
+    - control, rules: Drop xen
+  * Drop Changes:
+    - d/p/379d8f3ef3219bd400c7893d0a262b079c1de408.patch: riscv64 support
+      [Fixed in 2.0.32-1]
+
+ -- Kevin Becker <[e-mail]>  Tue, 03 Feb 2026 14:03:05 -0500
+
 kexec-tools (1:2.0.32-3) unstable; urgency=medium
 
   * Pull in two patches from upstream to fix build failure on ppc
@@ -26,6 +37,20 @@ kexec-tools (1:2.0.32-1) unstable; urgency=medium
 
  -- Khalid Aziz <[e-mail]>  Mon, 20 Oct 2025 11:28:31 -0600
 
+kexec-tools (1:2.0.31-1ubuntu2) questing; urgency=medium
+
+  * control, rules: Drop xen again.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 11 Sep 2025 09:57:01 +0300
+
+kexec-tools (1:2.0.31-1ubuntu1) questing; urgency=medium
+
+  * New upstream release (LP: #2122318). Remaining changes:
+    - d/p/379d8f3ef3219bd400c7893d0a262b079c1de408.patch: riscv64 support
+  * Add libzstd-dev build dependency for EFI_ZBOOT
+
+ -- Tobias Heider <[e-mail]>  Wed, 10 Sep 2025 15:56:41 +0200
+
 kexec-tools (1:2.0.31-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ff4d248..cb92055 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: kexec-tools
 Section: admin
 Homepage: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/
 Priority: optional
-Maintainer: Khalid Aziz <[e-mail]>
-Build-Depends: debhelper (>= 10.0.0),  debhelper-compat (= 13), gnu-efi (>=3.0a-4)[ia64], libz-dev[arm64 ia64], po-debconf, libxen-dev[amd64 arm64], quilt
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Khalid Aziz <[e-mail]>
+Build-Depends: debhelper (>= 10.0.0),  debhelper-compat (= 13), gnu-efi (>=3.0a-4)[ia64], libz-dev[arm64 ia64], po-debconf, quilt, libzstd-dev
 Standards-Version: 4.5.1.0
 Rules-Requires-Root: no
 
diff --git a/debian/rules b/debian/rules
index 716901b..37faa59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ configure-stamp:
 	dh_testdir
 	dh_update_autotools_config
 	dh_autoreconf
-	CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" dh_auto_configure -- --prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --mandir=/usr/share/man --datadir=/usr/share
+	CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" dh_auto_configure -- --prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --mandir=/usr/share/man --datadir=/usr/share --without-xen
 	touch configure-stamp
 
 build: build-arch build-indep