gentoo resync : 16.04.2022

3 files changed, 127 insertions, 0 deletions

diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index d5557f63f8f2..cf71fb24d88d 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,3 +1,4 @@
+AUX pf-sources-5.17.2-sched-uclamp-fix-functions.patch 1267 BLAKE2B 0f6d3b6f9b88fdfe0e7ebc20a49cdd2933e6fa65afbc954f97436c216651b23808f76931e26ce5d3cdd7eeadbb3b5e637a32afb0f3e0732650a621f66c2f3f7a SHA512 a85fadd02572666c7111bbd0041f78972d437ed5355a4674f370c7a1536dc8560fe6b45bb7b309755f8f9dd1a98dceda025aa046ab7cb3ae8c625bb1f562bf00
 DIST 1013_linux-5.15.14-pf.patch 99091 BLAKE2B eb5083f51326ac117160edc94494a438b2df252b777e21b5e2cf5f5e1cdf1e689a6f44c95ce724a9dbd414880a564e9c11b5fd97041b8d7600b65c18cd4fa8d8 SHA512 c87d54f7572c178c5c498afd4acc1ddd11c67caed76f2931a4a3c113ca434e369dda4aacbbc8f6ba04a7b3dec5cf732e0b19f3937c4638463feba3fecfca1363
 DIST 1014_linux-5.15.15-pf.patch 39365 BLAKE2B 3a0554c57804194364ca2565e4766cc3c3ddddac16b8e4e155caece2f5168e420547c3e49ef4246fdf799685ef2989549b05725f56a0bb3a6a9d40b49030731d SHA512 dce4c8f7a4da949dbd49a6aefd018404cc274ead04eda4cb8c9a74416c32a42bfd6cd76dfb29a89637ebac1186f0558ea1f6e1da3c197300f94791c5a0412890
 DIST 1015_linux-5.15.16-pf.patch 42879 BLAKE2B be5248dc26b5aa46459d97151fa8d017a6ef21375fc412373fb9691118fa9c299e5af76d9c527b2a7341077d3f460728f27b91d2ae8799049185901617a7de64 SHA512 65319bd62c26956fafc2ea4c08454b3ad169bafecb9c0a894b24ef5b77255f2dd01d0a5426436ab779e4e5c00fa1f123fb07abd6a074242dfad0d06906e140b5
@@ -8,6 +9,8 @@ DIST genpatches-5.16-1.base.tar.xz 3920 BLAKE2B e5749033cbb870b0fb43733b388a7b34
 DIST genpatches-5.16-1.extras.tar.xz 3780 BLAKE2B 59d482903c1eab9800ca9e9dad75bf4cc54d5676e44693f23a48e138bba8dea157f1ca9eb23fb081f8287fc62cc74746ec73504456d544958ef8d1f992fe9a33 SHA512 1271830d5c99c17ad7b00b9305f0cc9b02aafd3c798b8d1cee8eafd755191b30530f75207108b50429410ed581a1327cea5b866b150725399fba63eab9972235
 DIST genpatches-5.17-1.base.tar.xz 7588 BLAKE2B d0046364d4f26368f627d920552e1a67c6b5f25cf5b101ba6b04bf395482d3341deb65d2207159faab9028abc3a8e615746474072dec34d38732296a77d893f1 SHA512 b4f355f9006457374b212d5b79442d0d7fd371064943947ed2b64f0b1fd6357ac7e367249e11827444ea73f0ef1f015a7741d4ace38ae1d68fdcc67f00af0fd2
 DIST genpatches-5.17-1.extras.tar.xz 3800 BLAKE2B 7c7c955dbbc2aa6fe8b39f84c993f76aa117b5f218a2de9ff15a165c2d15d253a5adca5c979e5fd887d9b76cbfd2c9c70cc6f2d6d493fad011337e7a941cb498 SHA512 c47a545e6ac510e87f8239afc5b23aefb2956de3446a0e16b79396fb1c335456638101fd615446220987278bc1f68d1154958018793056699270d2250731c47d
+DIST genpatches-5.17-4.base.tar.xz 383992 BLAKE2B 2b3768d3095ed205a2a94494896cd4de9b516be63480bf67433a99819a783f52cd29862f1d5f513ec21dc7875a742a479648508ce5e3003ac6eab8d513b6cbbf SHA512 212bbcb00838b9910bb2da6bbae1579f575d0c9c5d4fcde0b401a685fa2004b21b606747e6bfea9f9d6e85d1fc54c62d75c7445f84e09466d3a32e2e0fcc3d3d
+DIST genpatches-5.17-4.extras.tar.xz 3796 BLAKE2B 0a0582a245794ce8fd6a472ed59a54d0f1e033e5741b7e2f6b41aadf07f3e05433cc2b4daacb507866a3bdeccf5f3ae08b6bbef23258620f584dcb309ac394c7 SHA512 4ec2216dc22443a06efb9c55b18d6734ca4e922a0901ef271e1f44d540d7dfa9bfe7f1ca5840fe2bf30a6a0dad584130d24257dbd603a5507c388ac6c29b2980
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
@@ -18,12 +21,14 @@ DIST pf-sources-5.16_p4.patch 3065274 BLAKE2B 52254316c04676ea47aed373fe367f145e
 DIST pf-sources-5.16_p5.patch 3607099 BLAKE2B 4b8659457862fb7c86215b19558b06dc66f8fd94362ac6030428e8a0c2a4bb99855ea55305bd086b39700c755ef6b245c91c2d0d3c7bc6d95a0226184740f82a SHA512 677843b205699feca6c932ad08b300756506b8d603bc2c636c0e1cda1cc344041aeec979c5846dc247361073e62034d00feaa62decc465a01ae827ccd3a03afa
 DIST pf-sources-5.16_p7.patch 4150817 BLAKE2B fd4217294d296852e56e693b37f7f758a2578a94a320c915f393aab764fc705195ae80cdc6445f59a65f773d94679baab4cee42dc7e1381ecae3a54acd3e7537 SHA512 4eb43313f6d402c4c6b32e4e1daf0e0433392c1fc000b510b17594a60894f2c77cc2acc1e0994a5158938609f87d175bf70f89f6f5442e3af29107bd5764b5ae
 DIST pf-sources-5.17_p1.patch 693915 BLAKE2B 66e707caab57da20ba35bee3d4cb8b9bc4604f19069eaa21f0d1fc26243fe4b4accbacff721a51847b382f333e623bbe0dc4ab7fa0f8ebf68820fce9cfd54a5d SHA512 91e8fc0b66dc249f26ce9f115e47eaa2b02122e2281f4c92e9cfca589a1253be208552c7f77ba2d21a78ab2a574514ab313e38c7379a3b4f80fd5dba22a033b1
+DIST pf-sources-5.17_p2.patch 2393949 BLAKE2B a511e99bee3d80e74ea21aecb19019ba95b56083e99fa5f060667fd2d857db7befb520587c43789be6806074f055f61bdb0d2e534a64b501134ff58ca7b0d1e8 SHA512 98382087dff1ac280017a703ab4fca9ecd7a2c43d57f4efac39f1cb6168627229f42ca530a7709691af47e86a28f9ae254fe17400ac79cb8e5e627baae3ff140
 DIST prjc-v5.16-1uo.patch 282840 BLAKE2B 9c6a27d999604febd831fb69d9722af3597096871d3330d750dd9ec3fefb79b7460d24c7713ce02aa8eba04222d0e112662fad21cdc1398b2e7e18f0a77ce629 SHA512 a18f38d7ac71159e0619f97665993eaeaf832bc08240aafd46a5c8a41a489de6b79bfbfe4bb104a655ca866174e79dbadae29a751e96864ebfb14e60756ab22a
 DIST prjc-v5.16-3uo.patch 270250 BLAKE2B b7ece53ae330499fa0da813428f1fd974fe540bf2cacb14122d50fde8a286c5edc3b5092a2316e38bd02c3ea3449932048ea35a10211f0008e5142aefcfd09a4 SHA512 5e86c21ac65effa184047c4e6238fc0f2c65d22d946d72f3325b75f7de80c0113f0380fcc1a9ba6219679895ecb74234bb13bb363573107d04315c83ef9cc68a
 DIST prjc-v5.16-4uo.patch 270113 BLAKE2B e88ec884ec8a539f9acc55844193d98c009d820bf18d8a6ca4dcb03d796897a15efc7006b35a736f31218895ffaf5cc83851a12f4db1b8e56b69ac8518347d02 SHA512 2f9eaef69d2125f6b23da3e597e2ed508266a93e3c3e1a0a04c1ba378448f8267a0985748b8de215c23fbbc62820a46da47671ff2e3ffd77f41bcca79cc11436
 DIST prjc-v5.16-5uo.patch 268223 BLAKE2B 3c0b89e36abaa95889d00abdbc8f3151fdd6fe0ed1e496730ed066ae22b68e5989c643441c69d733a920bf20149da6633e6a9e0b0062e997788919b10770eea0 SHA512 b95591e917d0b7b6b7fa7af62aac8f850aad7717e76f7ba17edfdb7ecbd53e31cf2c9409e1225f0aa6636564249c23a7f5c2bfc1e521cd1eec25a6e081b2122c
 DIST prjc-v5.17-1uo.patch 324972 BLAKE2B 62b746407aa3d5d14c8107950a7b9b77026ab0a48e2441f3d6953988056a60d4ced3438b069212f32d5cc0675540fe04cfc01a0ce8eb59fd25aeb7cb6061af85 SHA512 65c80cfd1813ee563829f894a386da20baa0b2e686fe40ddbe9c4d8e6586683c7e853d0c1a83f3e8f6355bedb06fa4f399fa0815dc03a722469fffd820e3f54a
 DIST prjc_v5.15-r1.patch 266858 BLAKE2B 110a03b5658200f7414922cf4ed361b6127c08d99359111209c86d951907626c92ff1e50f6906a0f56534e24aa2f35520dae11fa0d148ade488b93a401cb706f SHA512 1abcd3f10941b6e342cabb5fcd3d2a097ceb2451acad09336d3b191ace0bccca23202d87cc916fc0bacaf977e96b26a85e2b6729a08117c4cbe40a470dbf6eaa
+DIST prjc_v5.17-r1.patch 268834 BLAKE2B e8640372c4a3a180ee475e786466147dca3b5afe1a78f0346b63fb2654ef05cf7515626aa02b0949e43cb593477820b675c31459ba66cc40549eca1a5d33989b SHA512 83fd5708aaa03a3faf5eb183114f6d34cb44af2b0f66ac11abab92f02340639f772ec1b72add91db2f9b98dfd44b4b47fee771e24aca8af72e28d51bd57f50c1
 EBUILD pf-sources-5.15_p6-r1.ebuild 2847 BLAKE2B d43c6b2657199968583e72d81f902e04782a30fd4b3857e099206b94e517d8955504ca89b0162803ab0d17aa375c5f3c6d5361fc2e5b1bbc3b0926f3ff3a2cc8 SHA512 2ad5f3510e377d56d48f98979282391a0d3f98559355a5adf1ad10994bd50f0bd6eb3f321e70ed1a1979316aa6f1723f7224a55844786bc9f3ba02d49e5c5dea
 EBUILD pf-sources-5.16_p2.ebuild 2460 BLAKE2B f857ec577d55644dd7eb288c5e3c76f75602e1958a1428b118e9cfeb64958dd451b13e2d01f585934a6f236873331af3305d1a50812344938a05a9229b826113 SHA512 1c4d5443f4daba9f28645bdad974b6f79caea9ef344ee75fd68931e8d51ce8ebea41eb626356c16ca430ebb7665fcd3919efb4182edbd0e7c237a66b4f697e07
 EBUILD pf-sources-5.16_p3.ebuild 2408 BLAKE2B 2d7e60913b2944a5827767862cad267f73c47d5c76a2b2631563b07503ba607ad7d1cb394816401d1ec703f9d585f02c569be9e73fc8e9d85a867c49b7f1f725 SHA512 146934e11b35b535e320028742b46025fdc390ffb7233445a6423ce906a390d6698d3e3608499e911c6c532717f91d0174dc99a642c3300ad7a019e06bf0950f
@@ -31,4 +36,5 @@ EBUILD pf-sources-5.16_p4.ebuild 2408 BLAKE2B 2d7e60913b2944a5827767862cad267f73
 EBUILD pf-sources-5.16_p5.ebuild 2441 BLAKE2B d6ea446131c080743575d6c3d5283b6b4660b136d26ccbc217f03e927d0aab96f14926f5e8573cd41fdab84edddebfbac910d2fa0778eb4e7f6704a6e9f1760d SHA512 2d11d387f753ceb52cdf90c6713c3e787fac708bbbb8ebe4258489f78ef0b67ed9d056caae9097d5cc42a88b3516ab50c4550a9bee85bef7c62156fa50fd7632
 EBUILD pf-sources-5.16_p7.ebuild 2441 BLAKE2B fa39f4529b501c0ffc0af0268a8bf560f4bb8e9fd81979c553a2db2dc4df438154ad6b76d261e865a0dc9cdb5ea09ddc8d9a4a535a811d8758ae5d0575318ff9 SHA512 8b3e46cc15019ee1629af0a078e33eb7ba1081706505ee21cc667248db774f72342de69d644d22a91a5fcd039863cb7451d3477447158074b8b5c2bb8c32285b
 EBUILD pf-sources-5.17_p1.ebuild 2242 BLAKE2B 09d1357eee41d0d7463cafb1785141089251cf19a69df002c345315bafe3ee5253838184496f4f2b812f084c12d8ef651fb6e71731b55e19d5021bfc3a38fe83 SHA512 a7016b34648bed4529f05de7bec9567e4c48e37335a18846fff6f4db3f6f55bf331e5b72757a3314075ecd45c574047c8e03f3de7925adfce40778d151774214
+EBUILD pf-sources-5.17_p2.ebuild 2427 BLAKE2B 8539d54a2ad30caf2de01b8e4eb89ea8cf8d5aa561932dcd862e8574c58bb84dad0fc0050baab6a95acadcaaee61218d2ab8c417fb7e9d0655267cead7785d08 SHA512 c64ad20d5ba4af1fbd44ddeec139377c30eca281eb053a2c7447ad584411c6fe5d9edf07be84c82fbe99eaae4168cd831305685757d289bfb7839b61d7be6574
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch b/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch
new file mode 100644
index 000000000000..24404669add6
--- /dev/null
+++ b/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch
@@ -0,0 +1,43 @@
+From 170a1f1454a4453c0053f87723fd15634c863e05 Mon Sep 17 00:00:00 2001
+From: Tor Vic <torvic9@mailbox.org>
+Date: Thu, 7 Apr 2022 14:54:10 +0200
+Subject: [PATCH] sched/alt: [Sync] sched/uclamp: Add dummy functions to
+ sched_alt.h
+
+Syncup of the following 5.17.2 commits:
+  sched/uclamp: Fix iowait boost escaping uclamp restriction
+  sched/sugov: Ignore 'busy' filter when rq is capped by uclamp_max
+
+Link: https://gitlab.com/alfredchen/linux-prjc/-/issues/56
+---
+ kernel/sched/alt_sched.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
+index f2b9e686d6a6..55c2a4c0cb84 100644
+--- a/kernel/sched/alt_sched.h
++++ b/kernel/sched/alt_sched.h
+@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
+ }
+ #endif
+ 
++static inline
++unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost,
++				  struct task_struct *p)
++{
++	return boost;
++}
++
++static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; }
++
++static inline bool uclamp_is_used(void)
++{
++	return false;
++}
++
+ extern void swake_up_all_locked(struct swait_queue_head *q);
+ extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
+ 
+-- 
+GitLab
+
diff --git a/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild
new file mode 100644
index 000000000000..ba8fd5f3c6bd
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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="4"
+
+# -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*/}"
+
+# https://gitlab.com/alfredchen/projectc/ revision for a major version,
+# e.g. prjc-v5.14-r2 = 2
+PRJC_R=1
+
+# These is already patched via -pf patch set.
+UNIPATCH_EXCLUDE="1000_linux-${SHPV}.1.patch 1001_linux-${SHPV}.2.patch"
+
+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://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch"
+	"${FILESDIR}"/pf-sources-5.17.2-sched-uclamp-fix-functions.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
+}