gentoo resync : 22.05.2021

2 files changed, 74 insertions, 0 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index ee1fec82b641..5b251f72e888 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -24,6 +24,7 @@ DIST pf-sources-5.11_p6.patch 5055069 BLAKE2B 75ea4ce13e12762c282c51f07a4bf4553d
 DIST pf-sources-5.11_p7.patch 5538351 BLAKE2B 112f27ae4c640b5398dea06eb85b3f88518e9dfc94bcf104114cdd7d8a33a85c2decf32a696d8ce648c344cdf018af0b588b11785cb33394394a32f38b1d52db SHA512 f957283309a6d2116c0f130e59e944baf3b91d72991e5f74317e8badc6962153deccf4ba376fc33ff50ddae2d6f1b1f2d3419c68a036ec8fc68e94cfcd11c789
 DIST pf-sources-5.11_p8.patch 5688583 BLAKE2B 5d845677efd1d6ac95282d24223c7aa26d33ea74670b37184fda20dded42b5de1c4b4fd06f29afb12c8fd3372feb208b7d655c1dba3b60cfd1f4dc5cecfe5116 SHA512 62105aa308543ae5bb2e79be77dd77f3d4d3430669423c6e9e528acb114edf3b3a3cdcc2371ea566a6a51dbc16ebfba64187dabf485a96dea7c0127162173675
 DIST pf-sources-5.12_p1.patch 2785321 BLAKE2B 6010dcc736c6e068cb5aed9df790df6795f8b85f4169b9b6b66eb020f0e1821cd29630f421842c172f52fb41e4ac94f1671d506ec3f72f0bc883adbadd258302 SHA512 a861f3f96205de0c86a506bfd470116eeaabc8ec574e1940572abdfe166e16539f2fe874af5a0ea234741e5385e88491a49ba390a5493efc2fcc0c0283b43aa6
+DIST pf-sources-5.12_p2.patch 4252808 BLAKE2B 2c23009ba31caa7f5e6268d854af2bb2f9db2831a67cb34ef535fe1914d913f057f514aa8ce7c1a8a63374498c56d9bcce0662ed4ec3a888e2e7518b339196c1 SHA512 e2da600deeea7e16667bd0c9e0be9349f47441a4d9c2f06f66fb4f2a78c1b2c596a502cc35c6d9aea3ffcdb26461299f3446b5bb5a9b88b059806eb4db80d2b2
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
 EBUILD pf-sources-5.10_p12.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
 EBUILD pf-sources-5.11_p1.ebuild 1956 BLAKE2B 766738ea4460211f97ce61460a834e35215511ed63f252053d725bd16295e734fbbfe7044dfc598ebcdf19db1cff47ac5a9289a16c8f0ddef3e0e5a7075e2ed5 SHA512 4c5be584a0b6db1a0aacc690cb67ccad426c069d689eddcfdd9fca777ffee441b576a14d2edffaa3150ae542f05d55b3be0037e382a293470ec58457aed65e00
@@ -35,5 +36,6 @@ EBUILD pf-sources-5.11_p6.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0
 EBUILD pf-sources-5.11_p7.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.11_p8.ebuild 2305 BLAKE2B d82fd3ea8f7f664fdaf64c6ff2c019f1b0653cb1be2f021e459b38d995e006b82cba24136ef0edacba783f6a03bd9a3ce761d8c49571ccca1976f370df4c6125 SHA512 fe5258be1c9275c3c0cf5899e8b3cce08b7e33863f26c782bcc88a5c0420a3303660621524679608d741c97290778cf9cbd460acc6122c2fcdd16a17b5b7d4f0
 EBUILD pf-sources-5.12_p1.ebuild 2323 BLAKE2B 419cd340106f1ae9b7985e74c97e437868a841e8d59a021442df835c6db371321e1ee59713b2a69b08c17622b58234afcc81123279515bf8a6fc9d818eb1f087 SHA512 f224f798a50227e391968e07136b14a869e5f49eef4f42d44fd227ea1f17cebfa26b90da6811662a97d89049ff5245b63c58e5b315b5c70870978f9e4a55f980
+EBUILD pf-sources-5.12_p2.ebuild 2323 BLAKE2B 419cd340106f1ae9b7985e74c97e437868a841e8d59a021442df835c6db371321e1ee59713b2a69b08c17622b58234afcc81123279515bf8a6fc9d818eb1f087 SHA512 f224f798a50227e391968e07136b14a869e5f49eef4f42d44fd227ea1f17cebfa26b90da6811662a97d89049ff5245b63c58e5b315b5c70870978f9e4a55f980
 EBUILD pf-sources-5.9_p7.ebuild 1931 BLAKE2B d4078db28cec85fce53decefee620f24fe27f1bdb1b55d9a317661fcdc7d696c68fafe2cf83635deb7524f6ad3a11cf651f8751b6d760818bc2607fe853aa9a9 SHA512 e844c6f1f67b7bffa763809088e0843209f095e4d8b7beb44da19cd63d1e224053ee2785a01449f35aff53c55547bac4b37235ea366a70119c0cc34f5e67a01a
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.12_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.12_p2.ebuild
new file mode 100644
index 000000000000..7e09f4442745
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.12_p2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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"
+
+SHPV="${PV/_p*/}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+	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
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/${SHPV}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r0.patch
+	https://raw.githubusercontent.com/GKernelCI/linux-patches/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r0.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/5020_BMQ-and-PDS-io-scheduler-v${SHPV}-r0.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v${SHPV}-r0.patch"
+)
+
+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_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}