commit: 55323157d94b620afd1b11cd70a0ee66a9ad2d4d
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 08:02:08 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 08:54:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55323157
sys-kernel/linux-headers: add 5.19_rc3, drop 5.19_rc1
Fix installation while at it.
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
sys-kernel/linux-headers/Manifest | 2 +-
...aders-5.19_rc1.ebuild => linux-headers-5.19_rc3.ebuild} | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/linux-headers/Manifest
b/sys-kernel/linux-headers/Manifest
index 83f132bebced..d14b142c5e28 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -21,6 +21,6 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B
07a90cc640ff89e1359c06cee8c38abd33e51f9
DIST linux-5.17.tar.xz 128399340 BLAKE2B
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
SHA512
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
DIST linux-5.18.tar.xz 129790264 BLAKE2B
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
SHA512
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
DIST linux-5.4.tar.xz 109441440 BLAKE2B
193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13
SHA512
9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-headers-5.19_rc3-only-arch-and-headers.patch.xz 1330360 BLAKE2B
cc6f521037aeb898b2e2470f9e8f06378aa67a1b17679a38fa195c0a599a415eab763f6534701411cb658c8af28e8e28a3ff916fd29e01419713232336ce78fd
SHA512
50eba921f2aabbf27a78c966aa1a2920e7a1f6060cce70285d450e4f949890a90ca54114a95f43240d0daa87285561f11c1734aecb15e2d05bc575a3c3145cb6
DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B
947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86
SHA512
b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e
DIST linux-loongarch-next-on-5.18-20220523.tar.xz 160468 BLAKE2B
ccb6df7fbee86fba7ae725362efeb03cdf4187cf877a7f21e470639c14509214ed31c06434207950b219d34ed41a9fd2be0b711faeb5c6c02198836f06ef7dce
SHA512
d87b667947a1d41fbea6db80dc2896c2c7e297bac471b99820b10a4d1e8a680f3566a89bdb4e70c0bdfba335ce158f3e82f930eb2f6b64fd6ba736028bf709f2
-DIST patch-5.19-rc1.patch 90995640 BLAKE2B
0042e0a588fb4fa43259373e7c251e0f17f7640994d88bd1b27f73388a9a7a3229e03edc194f0cb719b9505fff651c7c9a4119c4f616040b35af7e500afd8d36
SHA512
bb2614786eecee03e38742a32dfbffce2b08881d35f51222dec88f9cec584eb1b60f3751e35f1a354124a162d443f0a4e345f6ee0193cebc29bc7ae5abb89003
diff --git a/sys-kernel/linux-headers/linux-headers-5.19_rc1.ebuild
b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
similarity index 74%
rename from sys-kernel/linux-headers/linux-headers-5.19_rc1.ebuild
rename to sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
index 273a2dcf6359..44c60013ad3e 100644
--- a/sys-kernel/linux-headers/linux-headers-5.19_rc1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
@@ -5,7 +5,11 @@ EAPI=7
ETYPE="headers"
H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64
loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390
score sh sparc x86 xtensa"
+# The v5.19 rc patches generated on kernel.org contain a suppressed binary
file diff,
+# hence unusable. Here we only let kernel-2 handle the base 5.18 tarball; the
+# v5.19 rc patch is to be handled later.
K_BASE_VER="5.18"
+CKV="${K_BASE_VER}"
inherit kernel-2
detect_version
@@ -14,7 +18,8 @@ PATCH_PV="${K_BASE_VER}"
PATCH_VER="1"
PATCH_DEV="sam"
SRC_URI="${KERNEL_URI}
-
${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}";
+
${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+
https://dev.gentoo.org/~xen0n/distfiles/sys-kernel/linux-headers/${P}-only-arch-and-headers.patch.xz";
S="${WORKDIR}/linux-${K_BASE_VER}"
# this is an rc version, for testing on loong only
@@ -35,6 +40,13 @@ src_unpack() {
}
src_prepare() {
+ # apply the gentoo-headers patches after the big v5.19 rc patch, for
+ # avoiding flooding the console because of the lirc change
+ PATCHES=(
+ "${WORKDIR}/${P}-only-arch-and-headers.patch"
+ "${PATCHES[@]}"
+ )
+
# TODO: May need forward porting to newer versions
use elibc_musl && PATCHES+=(
"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
