From 577fcc5bcef825157aafc07af78c8419c5988d00 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Thu, 18 Dec 2025 10:04:59 +0100 Subject: [PATCH] [alpha] Add patch to update uapi headers for glibc >= 2.42 --- debian/changelog | 4 ++ ...ont-reference-obsolete-termio-struct.patch | 44 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 49 insertions(+) create mode 100644 debian/patches/bugfix/alpha/alpha-dont-reference-obsolete-termio-struct.patch diff --git a/debian/changelog b/debian/changelog index 0a72c6e097..de04386b70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ linux (6.18.1-1~exp2) UNRELEASED; urgency=medium + [ Uwe Kleine-König ] * Make dracut the preferred initramfs generator. + [ John Paul Adrian Glaubitz ] + * [alpha] Add patch to update uapi headers for glibc >= 2.42 + -- Uwe Kleine-König Wed, 17 Dec 2025 22:57:43 +0100 linux (6.18.1-1~exp1) experimental; urgency=medium diff --git a/debian/patches/bugfix/alpha/alpha-dont-reference-obsolete-termio-struct.patch b/debian/patches/bugfix/alpha/alpha-dont-reference-obsolete-termio-struct.patch new file mode 100644 index 0000000000..616a499380 --- /dev/null +++ b/debian/patches/bugfix/alpha/alpha-dont-reference-obsolete-termio-struct.patch @@ -0,0 +1,44 @@ +From: Sam James +Date: Fri, 5 Dec 2025 08:14:57 +0000 +Subject: alpha: don't reference obsolete termio struct for TC* constants +Origin: https://git.kernel.org/linus/9aeed9041929812a10a6d693af050846942a1d16 + +Similar in nature to ab107276607af90b13a5994997e19b7b9731e251. glibc-2.42 +drops the legacy termio struct, but the ioctls.h header still defines some +TC* constants in terms of termio (via sizeof). Hardcode the values instead. + +This fixes building Python for example, which falls over like: + ./Modules/termios.c:1119:16: error: invalid application of 'sizeof' to incomplete type 'struct termio' + +Link: https://bugs.gentoo.org/961769 +Link: https://bugs.gentoo.org/962600 +Signed-off-by: Sam James +Reviewed-by: Magnus Lindholm +Link: https://lore.kernel.org/r/6ebd3451908785cad53b50ca6bc46cfe9d6bc03c.1764922497.git.sam@gentoo.org +Signed-off-by: Magnus Lindholm +--- + arch/alpha/include/uapi/asm/ioctls.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/alpha/include/uapi/asm/ioctls.h b/arch/alpha/include/uapi/asm/ioctls.h +index 971311605288..a09d04b49cc6 100644 +--- a/arch/alpha/include/uapi/asm/ioctls.h ++++ b/arch/alpha/include/uapi/asm/ioctls.h +@@ -23,10 +23,10 @@ + #define TCSETSW _IOW('t', 21, struct termios) + #define TCSETSF _IOW('t', 22, struct termios) + +-#define TCGETA _IOR('t', 23, struct termio) +-#define TCSETA _IOW('t', 24, struct termio) +-#define TCSETAW _IOW('t', 25, struct termio) +-#define TCSETAF _IOW('t', 28, struct termio) ++#define TCGETA 0x40127417 ++#define TCSETA 0x80127418 ++#define TCSETAW 0x80127419 ++#define TCSETAF 0x8012741c + + #define TCSBRK _IO('t', 29) + #define TCXONC _IO('t', 30) +-- +2.47.3 + diff --git a/debian/patches/series b/debian/patches/series index 43eed3a734..1b3d3c11b9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -62,6 +62,7 @@ bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch +bugfix/alpha/alpha-dont-reference-obsolete-termio-struct.patch # Arch features features/x86/x86-memtest-WARN-if-bad-RAM-found.patch