Gentoo Archives: gentoo-dev

From: WANG Xuerui <xen0n@g.o>
To: gentoo-dev@l.g.o
Cc: WANG Xuerui <xen0n@g.o>
Subject: [gentoo-dev] [PATCH 3/3] sys-kernel/linux-headers: add experimental loong patchset
Date: Sat, 23 Apr 2022 05:17:09
Message-Id: 20220423051559.1518072-4-xen0n@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/3] USE=experimental-loong masks, and LoongArch patchset for linux-headers by WANG Xuerui
1 Closes: https://github.com/gentoo/gentoo/pull/25162
2 Signed-off-by: WANG Xuerui <xen0n@g.o>
3 ---
4 sys-kernel/linux-headers/Manifest | 1 +
5 ...aders-5.17.ebuild => linux-headers-5.17-r1.ebuild} | 11 +++++++++--
6 sys-kernel/linux-headers/metadata.xml | 3 +++
7 3 files changed, 13 insertions(+), 2 deletions(-)
8 rename sys-kernel/linux-headers/{linux-headers-5.17.ebuild => linux-headers-5.17-r1.ebuild} (75%)
9
10 diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
11 index a401340c6125..4896ccb65e3c 100644
12 --- a/sys-kernel/linux-headers/Manifest
13 +++ b/sys-kernel/linux-headers/Manifest
14 @@ -18,3 +18,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
15 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
16 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
17 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
18 +DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B 947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86 SHA512 b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e
19 diff --git a/sys-kernel/linux-headers/linux-headers-5.17.ebuild b/sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild
20 similarity index 75%
21 rename from sys-kernel/linux-headers/linux-headers-5.17.ebuild
22 rename to sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild
23 index eef1c69bd485..3324029bd061 100644
24 --- a/sys-kernel/linux-headers/linux-headers-5.17.ebuild
25 +++ b/sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild
26 @@ -4,15 +4,18 @@
27 EAPI=7
28
29 ETYPE="headers"
30 -H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
31 +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"
32 inherit kernel-2
33 detect_version
34
35 PATCH_PV=${PV} # to ease testing new versions against not existing patches
36 PATCH_VER="0"
37 PATCH_DEV="sam"
38 +LOONGARCH_PATCH_VER="20220423"
39 +LOONGARCH_PATCH_DEV="xen0n"
40 SRC_URI="${KERNEL_URI}
41 - ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
42 + ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
43 + experimental-loong? ( ${LOONGARCH_PATCH_VER:+https://dev.gentoo.org/~${LOONGARCH_PATCH_DEV}/distfiles/linux-loongarch-next-on-${PATCH_PV}-${LOONGARCH_PATCH_VER}.tar.xz} )"
44 S="${WORKDIR}/linux-${PV}"
45
46 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
47 @@ -37,6 +40,10 @@ src_prepare() {
48 "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
49 )
50
51 + use experimental-loong && PATCHES+=(
52 + "${WORKDIR}"/loongarch-next-on-${PATCH_PV}
53 + )
54 +
55 # avoid kernel-2_src_prepare
56 default
57 }
58 diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml
59 index a40f7ecdd322..1c54ceadcf7b 100644
60 --- a/sys-kernel/linux-headers/metadata.xml
61 +++ b/sys-kernel/linux-headers/metadata.xml
62 @@ -5,6 +5,9 @@
63 <email>toolchain@g.o</email>
64 <name>Gentoo Toolchain Project</name>
65 </maintainer>
66 +<use>
67 + <flag name="experimental-loong">Add experimental LoongArch patchset</flag>
68 +</use>
69 <upstream>
70 <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
71 </upstream>
72 --
73 2.35.1