sys-kernel/linux-headers: Sync with Gentoo

It's from Gentoo commit 4d81fc834f4e0fb57d77359010f9f689bc293580.
This commit is contained in:
Flatcar Buildbot 2024-04-08 07:18:11 +00:00 committed by Krzesimir Nowak
parent 717bb7eb65
commit 9ab72adb17
4 changed files with 77 additions and 8 deletions

View File

@ -0,0 +1,64 @@
https://bugs.gentoo.org/918992
https://lkml.org/lkml/2024/3/6/1112
From 91577201977e109b2bda95077cb5db30864ab96e Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 5 Mar 2024 23:19:37 -0500
Subject: [PATCH] sparc: move struct termio to asm/termios.h
Every other arch declares struct termio in asm/termios.h, so make sparc
match them.
Resolves a build failure in the PPP software package, which includes
both bits/ioctl-types.h via sys/ioctl.h (glibc) and asm/termbits.h.
Closes: https://bugs.gentoo.org/918992
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
arch/sparc/include/uapi/asm/termbits.h | 10 ----------
arch/sparc/include/uapi/asm/termios.h | 9 +++++++++
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h
index 4321322701fc..0da2b1adc0f5 100644
--- a/arch/sparc/include/uapi/asm/termbits.h
+++ b/arch/sparc/include/uapi/asm/termbits.h
@@ -10,16 +10,6 @@ typedef unsigned int tcflag_t;
typedef unsigned long tcflag_t;
#endif
-#define NCC 8
-struct termio {
- unsigned short c_iflag; /* input mode flags */
- unsigned short c_oflag; /* output mode flags */
- unsigned short c_cflag; /* control mode flags */
- unsigned short c_lflag; /* local mode flags */
- unsigned char c_line; /* line discipline */
- unsigned char c_cc[NCC]; /* control characters */
-};
-
#define NCCS 17
struct termios {
tcflag_t c_iflag; /* input mode flags */
diff --git a/arch/sparc/include/uapi/asm/termios.h b/arch/sparc/include/uapi/asm/termios.h
index ee86f4093d83..cceb32260881 100644
--- a/arch/sparc/include/uapi/asm/termios.h
+++ b/arch/sparc/include/uapi/asm/termios.h
@@ -40,5 +40,14 @@ struct winsize {
unsigned short ws_ypixel;
};
+#define NCC 8
+struct termio {
+ unsigned short c_iflag; /* input mode flags */
+ unsigned short c_oflag; /* output mode flags */
+ unsigned short c_cflag; /* control mode flags */
+ unsigned short c_lflag; /* local mode flags */
+ unsigned char c_line; /* line discipline */
+ unsigned char c_cc[NCC]; /* control characters */
+};
#endif /* _UAPI_SPARC_TERMIOS_H */
--
2.44.0

View File

@ -24,14 +24,16 @@ BDEPEND="
dev-lang/perl dev-lang/perl
" "
[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
src_unpack() { src_unpack() {
# Avoid kernel-2_src_unpack # Avoid kernel-2_src_unpack
default default
} }
src_prepare() { src_prepare() {
local PATCHES=()
[[ -n ${PATCH_VER} ]] && PATCHES+=( "${WORKDIR}"/${PATCH_PV} )
PATCHES+=( "${FILESDIR}"/${PN}-sparc-move-struct-termio-to-asm-termios.h.patch )
# TODO: May need forward porting to newer versions # TODO: May need forward porting to newer versions
use elibc_musl && PATCHES+=( use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch

View File

@ -24,14 +24,16 @@ BDEPEND="
dev-lang/perl dev-lang/perl
" "
[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
src_unpack() { src_unpack() {
# Avoid kernel-2_src_unpack # Avoid kernel-2_src_unpack
default default
} }
src_prepare() { src_prepare() {
local PATCHES=()
[[ -n ${PATCH_VER} ]] && PATCHES+=( "${WORKDIR}"/${PATCH_PV} )
PATCHES+=( "${FILESDIR}"/${PN}-sparc-move-struct-termio-to-asm-termios.h.patch )
# TODO: May need forward porting to newer versions # TODO: May need forward porting to newer versions
use elibc_musl && PATCHES+=( use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch

View File

@ -17,22 +17,23 @@ SRC_URI="
" "
S="${WORKDIR}/linux-${PV}" S="${WORKDIR}/linux-${PV}"
# Unkeyworded for testing KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
BDEPEND=" BDEPEND="
app-arch/xz-utils app-arch/xz-utils
dev-lang/perl dev-lang/perl
" "
[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
src_unpack() { src_unpack() {
# Avoid kernel-2_src_unpack # Avoid kernel-2_src_unpack
default default
} }
src_prepare() { src_prepare() {
local PATCHES=()
[[ -n ${PATCH_VER} ]] && PATCHES+=( "${WORKDIR}"/${PATCH_PV} )
PATCHES+=( "${FILESDIR}"/${PN}-sparc-move-struct-termio-to-asm-termios.h.patch )
# TODO: May need forward porting to newer versions # TODO: May need forward porting to newer versions
use elibc_musl && PATCHES+=( use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch