summaryrefslogtreecommitdiff
path: root/sys-kernel/linux-headers
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-27 07:01:35 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-27 07:01:35 +0000
commite5558bb40ba46b03d0c8e82ae60dce9a32933989 (patch)
tree85455876dea191e90114ff262f0d971533de9cd0 /sys-kernel/linux-headers
parent0b8b325c6d134a9f66de2ba751280e6480e609af (diff)
gentoo auto-resync : 27:03:2024 - 07:01:35
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/Manifest7
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-sparc-move-struct-termio-to-asm-termios.h.patch64
-rw-r--r--sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild (renamed from sys-kernel/linux-headers/linux-headers-6.6.ebuild)6
-rw-r--r--sys-kernel/linux-headers/linux-headers-6.7-r1.ebuild (renamed from sys-kernel/linux-headers/linux-headers-6.7.ebuild)6
-rw-r--r--sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild (renamed from sys-kernel/linux-headers/linux-headers-6.8.ebuild)6
5 files changed, 80 insertions, 9 deletions
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 39adce894d3c..80350cc2ba2e 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,5 +1,6 @@
AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 2197 BLAKE2B 31ef872fd2658c141dda8653a4110003e7809d78dcd485abd15a9467e3090380e7314c7588ac5f8ec466eea7e6bcaf53dd25d4a1c548e199b1b57b06a911fd38 SHA512 1c0d5a46907617c5b6008ba06e726d268d18e2d80b1cc71325847dd9baa3571c237bcab640d4ed4fdf286ba89a9b56a8e415341da37f83f90ab94f2b6abbead3
AUX linux-headers-5.15-remove-inclusion-sysinfo.h.patch 778 BLAKE2B baf48088843ab6dd42bd4e69cacb39bbf9633e5ff58868606cb553794c42e6ad4b360166b567b4b39bea4c9cc68c299e32156c687db3aeac284bfb4ce3da1b55 SHA512 d5d6c6e6edb3d50b4f3005838625a8a0064ea6f30c0ed98913ef584e973cd7e47b9f0670f932a434d66df16e850b0efb4fb01052d962ca82464af13810054156
+AUX linux-headers-sparc-move-struct-termio-to-asm-termios.h.patch 2167 BLAKE2B 329026bbd5d61eb4b5b45869b44b403c0f90f7c544ec40a6e8182f11dd2e75898b52ab5e8454921324ac2fadab8e45eb226131d54996826795917d79b438d84b SHA512 23328d52351ae75f98591e9f091c2d803c594490a93c86a595cd258cd3f1eea8871a4fdcc93cd9f16d42b757aef5c5666b8782d9e96ab9b35b7d384cbf0673be
DIST gentoo-headers-3.18-1.tar.xz 3628 BLAKE2B 9e677389139e8e3e42508171593797b78f24368ceaba4f76c242b5827bf657444a65a0d3b334034cc54f7f14b00b9da7446356e1a5ffd9aacb05d5a336d4437f SHA512 89fb9b336fa3455752f6fe8626500d30245c04806890d4448a2895bbef2a5eae409940618fd4e0be57aa12784a198a695c32479f12d76450e16f2af1536e7a1f
DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
DIST gentoo-headers-4.19-1.tar.xz 4040 BLAKE2B 4ccaf4fb6bde84f0b1f29534cf2f6effca48cb81d63b33086a1ec667069bcb57a3c3d5697c50bff8521343954d01d9c27139d62a9cf2c9f5f12bc0461441f4af SHA512 511accdfd104d9cc84b568132f1eb822f97d35120a438768c313c2cc2651197414dae7af05db81e26b32fb4febbf1e0812030fcb98395f6f65271f6605dc7bb6
@@ -33,7 +34,7 @@ EBUILD linux-headers-5.10-r2.ebuild 1392 BLAKE2B 2704ce023b1a554d1e6526d9168f0cd
EBUILD linux-headers-5.15-r3.ebuild 1454 BLAKE2B 6fde074d12041aeed87168073b9516429c00dfb22bcfb9105dd257142f61bab598cc284d1454f430259d0155d14a3fc24570fb3d7d2c42470d924f98b7ef67af SHA512 df16524b36382b9caad1ad078ad82935f50b111877eac8515605c68e9a99bf5b12d27e33cd40fe02dec1475479a10d993b1ce7070d2a7d880cd7b7e35c99729f
EBUILD linux-headers-5.4-r2.ebuild 1254 BLAKE2B 4b8545aff89fbce63ac91030a81aa416664969e1475ab33e40e2612adaaac4918231b12178176dff833e9b8292575d1a9b17d32041d8362a3fd99671e5bedf8b SHA512 ba73a588dfde65af652ad9f8fe39ad4a59cdd285f0afaa7a6c038d1bb351770028864de5c304441fca9db3ebf1f1b2f0b2d57e4c8f2aba1c2ab9466c8e099176
EBUILD linux-headers-6.1.ebuild 1343 BLAKE2B 67d780d1d56be035accb9b130bb885a25efcf6ee0055d078fa7ebec84ee5b4a7c690d051994917dc88404a124096b861bc62105e654a4413aa3e52e34e22ff2b SHA512 71258e013303406a3cc3d0414d11366bfae7774bb70a0e7761c18de882db93505b34ef1aa6de93201b5b3ba4e6e9e64c7041b1b535baec0d937f993c3f57d6fd
-EBUILD linux-headers-6.6.ebuild 1280 BLAKE2B bcdd14076feec0085864635cb08f0d4bfb2553f207b20df30b01ea8d9c1b2a937d7c5caec55d3e8e1f51f3e22146457577e500e270afb6f7bf80b7adfbf7f3f8 SHA512 f34ce42f42952cf05116f8b69deec4cdb75e273484ea7e88779792c5ace43ddc2d9b161144468e2f19b91cef6c29a22a473e5c60548da9558a258a68987ff32a
-EBUILD linux-headers-6.7.ebuild 1283 BLAKE2B 3620bef181321f1f9c58fbba1278f5353c83386e07f53b7fcacf4542cceb69c1bd51c3ee3010c31b275f5e9926cb4253c03162f4e9c6d9f2cc1b35aa9b37012d SHA512 e3f85804dfef0f913034859437a066c3fb194a43e52258242c662e96feb26ac1e714b310667c858089139c7c4fbdc9cdafa176cf1bc0c01ea1ffa19f14681448
-EBUILD linux-headers-6.8.ebuild 1310 BLAKE2B d4b0fba0f144cc6a1b825131810b6cc5c7d8d2ace2423fb56ad96827676b701db3b5d738adc4ba5ba540de69c28d7b86fdc4608b6399f65cc5ab396a29d7aa39 SHA512 d3d0f27494363d8b817732e45d4c1d6d45fe8e23a6de2f9cc40ea179f63920528c46b1825bc9640167410aba6a0bb3797438af44e8b3fc4514225526df273f50
+EBUILD linux-headers-6.6-r1.ebuild 1382 BLAKE2B 8034775166a789827fbb69058b0b7ef835de72951d08b1eefda087cac539fc8e9c57a233ec7baf37a7666b7a82e856fd7f97cd804d278d53efe16d32d9efb2f5 SHA512 d5d7d64abf103ae334e608df621f8364fd9bc9252d414a26fbb71558a79507a150d8f9503bca47311c4d66f722e7f4e6530d8b7f03436838dc4bd363842f1799
+EBUILD linux-headers-6.7-r1.ebuild 1385 BLAKE2B 48d7c1eaabbc6e9420303ab10752807ad94bf41445844e416b4803ff8b8d19b703fbd275b0d7b13be0fee8a6b92dc99fb1f0e9e671812406f822bb8ba6bb6290 SHA512 f3c0385a65678ea6aa33c63054da4c5e1fd5ae7113f95de2931a1317c3c903d202cd216bb04f6ce9b5577f0429de9543bce233df75c7dc051bbbe326545531f4
+EBUILD linux-headers-6.8-r1.ebuild 1412 BLAKE2B c636e3ea3215c4483236819e8402bfc9a8249c552c1d5786dffc447e052a31c09cdefff387dba628a2248330ab1cbeac459fae43632400fe591ac5acd00df80d SHA512 fb67dd9d8e4da7a95976d6abb146283dfee133e5c2f673f2dcf0e3bce5b61d426e2af221f8f43dd3991a5843439575e62eb75f9a1bc9972189e51011b94f1a9f
MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/files/linux-headers-sparc-move-struct-termio-to-asm-termios.h.patch b/sys-kernel/linux-headers/files/linux-headers-sparc-move-struct-termio-to-asm-termios.h.patch
new file mode 100644
index 000000000000..7e8a7353bc6a
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-sparc-move-struct-termio-to-asm-termios.h.patch
@@ -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
+
diff --git a/sys-kernel/linux-headers/linux-headers-6.6.ebuild b/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild
index 17d8fd815b5c..1b82b2d037f1 100644
--- a/sys-kernel/linux-headers/linux-headers-6.6.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.6-r1.ebuild
@@ -24,14 +24,16 @@ BDEPEND="
dev-lang/perl
"
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
src_unpack() {
# Avoid kernel-2_src_unpack
default
}
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
use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
diff --git a/sys-kernel/linux-headers/linux-headers-6.7.ebuild b/sys-kernel/linux-headers/linux-headers-6.7-r1.ebuild
index e16c15ac5901..fe49fd6ed12e 100644
--- a/sys-kernel/linux-headers/linux-headers-6.7.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.7-r1.ebuild
@@ -24,14 +24,16 @@ BDEPEND="
dev-lang/perl
"
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
src_unpack() {
# Avoid kernel-2_src_unpack
default
}
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
use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
diff --git a/sys-kernel/linux-headers/linux-headers-6.8.ebuild b/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild
index 09d006337834..1320f29017ab 100644
--- a/sys-kernel/linux-headers/linux-headers-6.8.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-6.8-r1.ebuild
@@ -25,14 +25,16 @@ BDEPEND="
dev-lang/perl
"
-[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
-
src_unpack() {
# Avoid kernel-2_src_unpack
default
}
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
use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:54:12 +0000