From 1ebcf9f258f1a85e108a01123abe24cf2bc50ee8 Mon Sep 17 00:00:00 2001 From: Mikko Rapeli Date: Mon, 28 Apr 2025 15:32:43 +0300 Subject: [PATCH] lttng-modules: fix build failure on genericarm64 Workaround to unblock genericarm64 builds. Upstream is working on a better fix https://bugs.lttng.org/issues/1426 Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15840 (From OE-Core rev: c57a903b9ac6d3015195a59829c223917e9c41f8) Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie --- ...x-sigaction-build-without-CONFIG_COM.patch | 35 +++++++++++++++++++ .../lttng/lttng-modules_2.13.18.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch new file mode 100644 index 0000000000..eb43abbae2 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch @@ -0,0 +1,35 @@ +From 0e2095bcc50e7a07d3478f8d3c0ae5ad46575594 Mon Sep 17 00:00:00 2001 +From: Mikko Rapeli +Date: Mon, 28 Apr 2025 12:07:24 +0000 +Subject: [PATCH] lttng-modules: fix sigaction build without + CONFIG_COMPAT_OLD_SIGACTION + +Workaround build failure when CONFIG_COMPAT_OLD_SIGACTION is not enabled +in kernel config. + +Upstream-Status: Submitted [https://bugs.lttng.org/issues/1426] + +Signed-off-by: Mikko Rapeli +--- + .../instrumentation/syscalls/headers/arm-32-syscalls_pointers.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h b/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h +index 5f4ca5b..1514cae 100644 +--- a/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h ++++ b/include/instrumentation/syscalls/headers/arm-32-syscalls_pointers.h +@@ -1890,9 +1890,11 @@ TRACE_SYSCALL_TABLE(chroot, chroot, 61, 1) + #ifndef OVERRIDE_TABLE_32_ustat + TRACE_SYSCALL_TABLE(ustat, ustat, 62, 2) + #endif ++#ifdef CONFIG_COMPAT_OLD_SIGACTION + #ifndef OVERRIDE_TABLE_32_sigaction + TRACE_SYSCALL_TABLE(sigaction, sigaction, 67, 3) + #endif ++#endif /* CONFIG_COMPAT_OLD_SIGACTION */ + #ifndef OVERRIDE_TABLE_32_sigpending + TRACE_SYSCALL_TABLE(sigpending, sigpending, 73, 1) + #endif +-- +2.49.0 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb index 553dae9f4d..1b2327f609 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.18.bb @@ -10,6 +10,7 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-lttng-modules-fix-sigaction-build-without-CONFIG_COM.patch \ " # Use :append here so that the patch is applied also when using devupstream