Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: lttng-modu...@packages.debian.org
Control: affects -1 + src:lttng-modules
User: release.debian....@packages.debian.org
Usertags: pu
[ Reason ]
Fix the dkms build of lttng-modules against the current bullseye kernel
5.10.0-33 to allow seamless upgrades to bookworm.
[ Impact ]
Results in upgrade failure when the dkms build fails.
[ Tests ]
Tested manually on a bookworm virtual machine with a bullseye kernel.
[ Risks ]
Minimal, the change is a single line version check in a macro.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Backport a single patch to adjust and version check in a macro.
diff -Nru lttng-modules-2.13.9/debian/changelog
lttng-modules-2.13.9/debian/changelog
--- lttng-modules-2.13.9/debian/changelog 2023-03-07 14:12:32.000000000
-0500
+++ lttng-modules-2.13.9/debian/changelog 2025-02-18 15:19:43.000000000
-0500
@@ -1,3 +1,11 @@
+lttng-modules (2.13.9-1+deb12u1) bookworm; urgency=medium
+
+ * Fix build on linux 5.10.0-33 from bullseye (Closes: #1095902)
+ * [2f122b3] Bookworm gbp branch config
+ * [91937e4] Add patch to fix build on Linux 5.10.220..5.11
+
+ -- Michael Jeanson <mjean...@debian.org> Tue, 18 Feb 2025 15:19:43 -0500
+
lttng-modules (2.13.9-1) unstable; urgency=medium
* [2f1b62b] New upstream version 2.13.9
diff -Nru lttng-modules-2.13.9/debian/gbp.conf
lttng-modules-2.13.9/debian/gbp.conf
--- lttng-modules-2.13.9/debian/gbp.conf 2023-01-16 11:54:07.000000000
-0500
+++ lttng-modules-2.13.9/debian/gbp.conf 2025-02-18 15:16:18.000000000
-0500
@@ -1,3 +1,3 @@
[DEFAULT]
-upstream-branch=upstream/latest
-debian-branch=debian/sid
+upstream-branch=upstream/bookworm
+debian-branch=debian/bookworm
diff -Nru
lttng-modules-2.13.9/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
lttng-modules-2.13.9/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
---
lttng-modules-2.13.9/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
1969-12-31 19:00:00.000000000 -0500
+++
lttng-modules-2.13.9/debian/patches/fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
2025-02-18 15:16:18.000000000 -0500
@@ -0,0 +1,44 @@
+From 9d45723b3dbe35c57273536d21784a5f1aeaddad Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjean...@efficios.com>
+Date: Tue, 25 Jun 2024 14:15:39 -0400
+Subject: [PATCH] fix: file: Rename fcheck lookup_fd_rcu (v5.10.220)
+
+See upstream backported commit:
+
+ commit c4716bb296504cbc64aeefb370df44e821214c44
+ Author: Eric W. Biederman <ebied...@xmission.com>
+ Date: Fri Nov 20 17:14:27 2020 -0600
+
+ file: Rename fcheck lookup_fd_rcu
+
+ [ Upstream commit 460b4f812a9d473d4b39d87d37844f9fc30a9eb3 ]
+
+ Also remove the confusing comment about checking if a fd exists. I
+ could not find one instance in the entire kernel that still matches
+ the description or the reason for the name fcheck.
+
+ The need for better names became apparent in the last round of
+ discussion of this set of changes[1].
+
+ [1]
https://lkml.kernel.org/r/CAHk-=wj8BQbgJFLa+J0e=iT-1qpmCRTbPAJ8gd6MJQ=kbrp...@mail.gmail.com
+ Link:
https://lkml.kernel.org/r/20201120231441.29911-10-ebied...@xmission.com
+
+Change-Id: Ib880bd8feef1c5d75d2a018cd93a1d464485ab7b
+Signed-off-by: Michael Jeanson <mjean...@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
+---
+ include/wrapper/fdtable.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/wrapper/fdtable.h
++++ b/include/wrapper/fdtable.h
+@@ -12,7 +12,8 @@
+ #include <linux/fdtable.h>
+ #include <linux/sched.h>
+
+-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
++#if ((LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) || \
++ LTTNG_KERNEL_RANGE(5,10,220, 5,11,0))
+ static inline
+ struct file *lttng_lookup_fd_rcu(unsigned int fd)
+ {
diff -Nru lttng-modules-2.13.9/debian/patches/series
lttng-modules-2.13.9/debian/patches/series
--- lttng-modules-2.13.9/debian/patches/series 2022-06-01 10:36:39.000000000
-0400
+++ lttng-modules-2.13.9/debian/patches/series 2025-02-18 15:16:18.000000000
-0500
@@ -1 +1,2 @@
fix-linux-rt-4.9-sched.patch
+fix-file-Rename-fcheck-lookup_fd_rcu-v5.10.220.patch
