gentoo auto-resync : 17:10:2022 - 07:54:11

2 files changed, 88 insertions, 0 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 60051a02ca59..badd80453926 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -12,6 +12,7 @@ DIST linux-5.19-pf4.tar.gz 212225287 BLAKE2B e6e96c998336bfd39725f5f7da8e91e1291
 DIST linux-5.19-pf5.tar.gz 212240899 BLAKE2B dcdd4208335427217662e571c60373559504c0322d8718c22fb72f7d6dca3fbb1d95c9ef1b480938508ae22338d229285b3da5f6c2b0050d7f70d4b792761b0f SHA512 3b0887cf21272c22d3d4e821ec36994af7160ca66b84910c7103d46d72449d3e8c1f8bfdaf1e568111c7c601b61a521bada3f10696b5a27f4f41494b746c76fe
 DIST linux-5.19-pf6.tar.gz 212237665 BLAKE2B 7ecace44c0bff940009fdb1cd8924096cc4cc337688c7d73883a996bc191d40b9589efbca2e30ba413e1516b790ad48be4839f9d48bb8ad5c40d3f8549a63db1 SHA512 7f5e60c20ba577102818139b0eb61fff5d8b2f3ecdcd42e3ad116fdebdfa58da4f08dd151844cd6e1d764aad5f5a2254e4a1c5aad5b3628df9d03911a2cd8e3f
 DIST linux-6.0-pf1.tar.gz 218275822 BLAKE2B bb283adca2398ef3e09a9c02e5a6609f898c765cc322376e5621c736a2b38832e1e13bc53fc3b21b1dae8214bd039ce43be57e97e7b129624124e58cd1123f51 SHA512 e97c449693b5702e18560c86a65dac2022828d2d57a8734a3cd26b304f8c0d5aa5773041701c8bd5a63b31481191b501070ad9d811a08382e8c846517a7930e0
+DIST linux-6.0-pf2.tar.gz 218282377 BLAKE2B 753efa1e2e05255540301f9bbf9aa85eff8eb2c45c9092e9b9e09e288df626c93bab2621af6ee1758631ea7759890dc69a124201bde5151b429885a014cf782e SHA512 faa581fa6d3deda5ee67a82f49e19e7680f134fc198a50bd8a37bbe495c70663bea8e5887615e0d4315ef8086359c9da74fb3ecc222170a06f5b7702f6b2f8da
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 DIST prjc_v5.19-r0.patch 271689 BLAKE2B 6bc109b462670602eba8ccba55cbcf9902402c627e40c62a3a574828847a518d84d35d30e786b2f1edd4365a3eaa3a2b358f20c013bb2789b30804c37fe12d45 SHA512 27011aa6586ca8c7ec953593f68289b437a7ddab841eb5e45dfca1fdfed5ddb59cf0e197703d4c62c2cd792fca9f2c97f341ffc5ee48a9ca3aff26f9505280ba
@@ -23,4 +24,5 @@ EBUILD pf-sources-5.19_p4.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530
 EBUILD pf-sources-5.19_p5.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-5.19_p6.ebuild 2930 BLAKE2B a0cca626797143fc0ea9be0528f1da8530b06445e0a99386cfe4591f003ea2d4798fbbd04163637adccbb934ee6681ecc382a8bccd60c357c9159647e22b3466 SHA512 73b4069c74c18baf9f3257db8b3eb1c6438c89dc22eaafef297a7ae063d48149715704155bf2e5296db0a153d7620e88823cfa4288c5d4ea709c43ce714aedf6
 EBUILD pf-sources-6.0_p1.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
+EBUILD pf-sources-6.0_p2.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild
new file mode 100644
index 000000000000..3f80ddc991c8
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.0_p2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf"
+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://codeberg.org/pf-kernel/linux/wiki/README
+	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() {
+	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
+	# to manually eapply the genpatches too.
+	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
+}