commit: b1143c32b2da85400b721fed0d49bbdffe055280 Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Sat Apr 23 03:30:26 2022 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Sun Apr 24 01:58:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1143c32
sys-kernel/linux-headers: add experimental loong patchset Closes: https://github.com/gentoo/gentoo/pull/25162 Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> profiles/arch/base/package.use.mask | 1 + sys-kernel/linux-headers/Manifest | 1 + ...inux-headers-5.17.ebuild => linux-headers-5.17-r1.ebuild} | 12 ++++++++++-- sys-kernel/linux-headers/metadata.xml | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 7c645abdafc0..2dad2e3c3a61 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -7,6 +7,7 @@ # In the meantime, force-enable on loong only. # This is not inside use.mask, because crossdev toolchain packages would # want to have the flag enabled without hassle. +sys-kernel/linux-headers experimental-loong sys-libs/glibc experimental-loong # James Le Cuirot <ch...@gentoo.org> (2022-02-24) diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index a401340c6125..4896ccb65e3c 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -18,3 +18,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f +DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B 947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86 SHA512 b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e diff --git a/sys-kernel/linux-headers/linux-headers-5.17.ebuild b/sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild similarity index 73% rename from sys-kernel/linux-headers/linux-headers-5.17.ebuild rename to sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild index eef1c69bd485..2387a0ff3ede 100644 --- a/sys-kernel/linux-headers/linux-headers-5.17.ebuild +++ b/sys-kernel/linux-headers/linux-headers-5.17-r1.ebuild @@ -4,18 +4,22 @@ EAPI=7 ETYPE="headers" -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" +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" inherit kernel-2 detect_version PATCH_PV=${PV} # to ease testing new versions against not existing patches PATCH_VER="0" PATCH_DEV="sam" +LOONGARCH_PATCH_VER="20220423" +LOONGARCH_PATCH_DEV="xen0n" 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} + experimental-loong? ( ${LOONGARCH_PATCH_VER:+https://dev.gentoo.org/~${LOONGARCH_PATCH_DEV}/distfiles/linux-loongarch-next-on-${PATCH_PV}-${LOONGARCH_PATCH_VER}.tar.xz} )" S="${WORKDIR}/linux-${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE+=" experimental-loong" BDEPEND="app-arch/xz-utils dev-lang/perl" @@ -37,6 +41,10 @@ src_prepare() { "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch ) + use experimental-loong && PATCHES+=( + "${WORKDIR}"/loongarch-next-on-${PATCH_PV} + ) + # avoid kernel-2_src_prepare default } diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml index a40f7ecdd322..1c54ceadcf7b 100644 --- a/sys-kernel/linux-headers/metadata.xml +++ b/sys-kernel/linux-headers/metadata.xml @@ -5,6 +5,9 @@ <email>toolch...@gentoo.org</email> <name>Gentoo Toolchain Project</name> </maintainer> +<use> + <flag name="experimental-loong">Add experimental LoongArch patchset</flag> +</use> <upstream> <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id> </upstream>
