[gentoo-commits] repo/gentoo:master commit in: sys-kernel/pf-sources/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     383b92bc508b5e0dbb546e4fcb8b9be6d40a0435
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 07:26:06 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 08:43:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383b92bc

sys-kernel/pf-sources: add 6.1-pf4

 - bump genpatches to include
   gcc-plugins-Reorg-gimple-incs-for-gcc-13.patch,
 - update the ebuild to automatically detect when genpatches version is > 1,
   so vanilla linux patches are deleted since they're included in the pf patch
   set.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-kernel/pf-sources/Manifest                 |  3 +
 sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild | 94 ++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 88066701520b..0cb94bf36d9d 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a1
 DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
 DIST genpatches-6.1-1.base.tar.xz 4304 BLAKE2B f58a4e46ba85da5bee55c6fa14a57e7546813d167ac3d78fa8bfe4b386ce2240279b7c936094271cffbabd9f6eafd76a7bd609fb2136400cef2eaf443b452cd3 SHA512 310c97fb844db4ffd7272144d1d2d3d5fee1ecc31527ef3a6f0b67f0fbf1f3b7f9f9db9ae52f6e309cb7a8e0790019707db24db5db670d58179b7648c677c1d2
 DIST genpatches-6.1-1.extras.tar.xz 3804 BLAKE2B 62ee97ed9142b41f415129dfb12d10387561258c6798f055ef5c8767ca0f31b36d785045df4207f704ea37f6764a0fb6e6fb78859c0679ca5a75a5aa5fc458cd SHA512 21b8f5a44809a9866063fbac676df25db709105c702a5b90e5acb21f6a01f60d3a559d8398dba1ec2b0ade89b3a45b587933cb7ded0621d8e4aa13b4d4eb5daa
+DIST genpatches-6.1-10.base.tar.xz 591388 BLAKE2B 5352d923a1df59c38cd1061ea9454041143a9786e4c81c195edb0e50ae9490f9629f2806482246c417db294a2ad9b643c9a6b38403c46c1b135c73a94506e6f2 SHA512 5ed3ea65e2ad63f4d59241b8e11f4de068564e5079c7fd6d511e9636867843e517b662f744577b615cbd572fa7313af260fb07c5c4e39e0cd114e4f315d3d777
+DIST genpatches-6.1-10.extras.tar.xz 3804 BLAKE2B 2a713dcd63d5946368d0bf88fee904b05f3fceac266173aa3016c528cfb40eff98f7aeaca2fd67e52a02a39b80b430fd55c8abd65ff5e61dbb6e6cd6ee757282 SHA512 152c134efcd7ceeb233bd7d9211a871d6b4f633e4782ac73657d583e4f149763e37ad7cf0f19efbf1c4c25fc50f3c67167b15f024eabfcfcb016b1cb23c36ae0
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST linux-5.18-pf5.tar.gz 206988172 BLAKE2B ae5abdee064b429019d7aaa4801d0bf852ed94dfef3965486cbc58d084e68ab9276651297857c1e64d5430e8b17728d1ebd7db597afd7ed7580d100e84431921 SHA512 dde7c08750858a719c70ff332df67b73432ace56571c73dfb7af7bf4ab4d5b5fbfb94486ac97b4b95e252f51a3be125fdb05a3abdc1b7443fb45ca4074810996
@@ -14,5 +16,6 @@ DIST linux-6.0-pf6.tar.gz 218406147 BLAKE2B b084ffd751a3be9043ab0c306623c2ede659
 DIST linux-6.1-pf1.tar.gz 220692376 BLAKE2B 4d5eb13df0d433057a7b7a6c347c44f42f3edbd8cf714258d274f8c65226e9ac09b80d583088678b25865dc73c2c29085949731b425e8529a5022c590d94220e SHA512 8b54d6b79e21fd89e64faac7502d846f9b1a1f6a1ad52f3bb3ead6074f7fe8e9fa531b8fa06a22372127a66da0c0234fb114a9f707e6512e3643328173ec1729
 DIST linux-6.1-pf2.tar.gz 220718450 BLAKE2B 54ce340573f6c0144db3a77355553a49607b83ef7fe5fda308d4eb4d04c5b5014ea9241f8e17e7c2bd89b7f10567a14814d027fe1826d78f4182127a1ebfa825 SHA512 db7d28834ea60e38873823c3a83e1f6a128d34f0a698a728052cde50cee7c5f40a8b41e0ec53e069887fe4b72ea3837a5adc4deee4036e8c6bda084cac0d806b
 DIST linux-6.1-pf3.tar.gz 220765042 BLAKE2B 0a52e6d6dbc8f18957ed3348f33edc8df0df7a30700cbc11792f0e668bc613f842ac0d92fcb45a9093aa9a893e3df0f05e16afce3f7734f8f41f7dd33083c72f SHA512 d1a0077d13600d7b684c59158e7994eeca6d9f8864eed40279b2fcfbb7cae627c1eab4d7e9a403d352409493b9fe82c037bd1f710578a13527505a41051bdf05
+DIST linux-6.1-pf4.tar.gz 220785813 BLAKE2B fe4b173aeba8a0101346e795331194bbc6c56c409191030ad18b56910d846e9ab473d03db35968d5f6a7ded1ba6ae3685ce9fea72bc578b7f1a20cc84088973b SHA512 57d3a8e16d0eca172f77e7a84bc73c514a05e5df66ae1151fe6230d462ae5d2fff8030852d03fa5cf008e4f36ed2cd9d85a3fd2df2a1c3533565f18cf0c1d81d
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e

diff --git a/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild b/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild
new file mode 100644
index 000000000000..2cc09b7a1782
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.1_p4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run.
+ETYPE="sources"
+
+# Use genpatches but don't include the 'experimental' use flag.
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Genpatches version to use. -pf patch set already includes vanilla linux updates. Regularly "1"
+# is the wanted value here, but the genpatches patch set can be bumped if it includes some
+# important fixes. src_prepare() will handle deleting the updated vanilla linux patches.
+K_GENPATCHES_VER="10"
+
+# -pf patch set already sets EXTRAVERSION to kernel Makefile.
+K_NOSETEXTRAVERSION="1"
+
+# pf-sources is not officially supported/covered by the Gentoo security team.
+K_SECURITY_UNSUPPORTED="1"
+
+# Define which parts to use from genpatches - experimental is already included in the -pf patch
+# set.
+K_WANT_GENPATCHES="base extras"
+
+# Major kernel version, e.g. 5.14.
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf", since using "-pf" is not allowed for an ebuild name by PMS.
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://pfkernel.natalenko.name/
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# When genpatches basic version is bumped, it also includes vanilla linux updates. Those are
+	# already in the -pf patch set, so need to remove the vanilla linux patches to avoid conflicts.
+	if [[ ${K_GENPATCHES_VER} -ne 1 ]]; then
+		find "${WORKDIR}"/ -type f -name '100*linux*patch' -delete ||
+			die "Failed to delete vanilla linux patches in src_prepare."
+	fi
+
+	# kernel-2_src_prepare doesn't apply PATCHES(). Chosen genpatches are also applied here.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}