Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!139

sys-kernel/xanmod-sources/Manifest

@@ -7,6 +7,8 @@ DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d451
 DIST patch-5.10.1-xanmod1.xz 84852 BLAKE2B c3f41a05c92ca57d3e5117d8096d8180119a4d4bec7cb7adf9bad9afa4ed332128400ad17de7ed517fb2661f1356e954108aa786150748b99c5268f482541f6e SHA512 13b32629072c87eef98a42f10ef41040c48a8f01f33f4ce1042370672da107b3d11e73cc5ea437600622bea2116c856aade691ef95eef86181868c200161f8db
 DIST patch-5.10.2-xanmod1-cacule.xz 95684 BLAKE2B 3bc336813ce24e4bb7bd93d4969f555c8d27ff99c77366edbffabc969d197a306e496af49d5db846daf35f50a4c895c1b6567f66a54c644c2c9cdc23fbc96176 SHA512 6d6d83ef6c7ad53df10f43a094a7fa418267b7cb4722d84049685f2d7611839143636fd034ac25adcec25920c54c8b1faea3f36189443d8f164e0a13eceed888
 DIST patch-5.10.2-xanmod1.xz 88392 BLAKE2B 5d19e9ea45f7dcd8c644c4055eacb1e46b64a7e1ca39ed5f5550e8c59546a93a54a918528b160549d5c534f7b461173a58826fa5d3b737a12455d39fbc31613a SHA512 3f39aa11747a74471e7aaca3a006092b3075a48c01133d2c01406150d16e598cd1f086e7699cb705f6d993b0f0e5bb6e9e1b977f52da254fb267e40fe082ea84
+DIST patch-5.10.3-xanmod1-cacule.xz 106272 BLAKE2B dce12457218040d4788fccd2b0061014e18194b48b3de10d98eb3f783cc606c267185b66ff9283eae314793090350ff9bd868da6540cdc0fda43651078aeefdd SHA512 3fa141e26dddcd6db86ad999a4a2312dba2084a4b4e712806953d1d778761ad324abda16a19ca9c383b06feb103b75c15d5a1ec53a9a077b09220fbb70226f6c
+DIST patch-5.10.3-xanmod1.xz 99040 BLAKE2B f0886db9c928a7d7fd37ae194770da5a8b205714990ab003b3db484531ef4d0f75279cb18e25fa21cedb18bbdd03eea48460e80832d3257affa6d952da61f93d SHA512 a91db9aa5493a0aad1501774692e1e836eb35e2d42ddf966d35609dba4a593902d88b61f8ff377ff51a9f4d9433ab7daa2bca17ff82a4503bef33ca2b1852237
 DIST patch-5.9.10-xanmod1.xz 583644 BLAKE2B 220f85a6a73e36d62cbca83f7b5ff2d769306e21446ef05413fe3d0f0ed2e2c1fdb60cf97d425b83e5ff09242de3e5d61e38418c8a9838b17afe927fdd859d39 SHA512 acae618df28403d2950c5910ecc8dfd78e1c58ed4e8ff3787c1776e00462289e929c3097b5027103c1bda6187495664dc2b082adad6c05c42c3922de530a49d9
 DIST patch-5.9.11-xanmod1.xz 639524 BLAKE2B f58c2491000e2b5e2302cfe03bb84dca5c23c152fe4c6bf0e2970a64b3683f6583cb393f82d648a58c69fed51a993c877073c34eea58654775c511a3e2291c0b SHA512 b5a3ab6250d28f97a20d26b1384fff5cc7c2232c2a976ad44f2b97141c1a6da800642a25ebd5a306371a2932d10f2758c0cf36ae879c43b0d3ab4b10dad6117d
 DIST patch-5.9.12-xanmod1.xz 684744 BLAKE2B f716145dff09725018080a998ce9e9ace9c4a4d39599a7aaedf90a10fc94135deb1fdffd746119fd5546e6216581b91bc37ef62b81c3e31267e58a106c6e9927 SHA512 cb7f7a05ef0c9badc7acaca27e97287e1dcfe0e70180b88cea297c3994cba73714cec8bf7bdd7ceca786a2248dcdfa96121bfda9d201a56efd1d729d5d17de80

sys-kernel/xanmod-sources/files/no_reset_on_migration.patch

@@ -0,0 +1,15 @@
+diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
+index 957e418f05f7..335efc1c6f06 100644
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -6996,8 +6996,10 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
+ 	/* Tell new CPU we are migrated */
+ 	p->se.avg.last_update_time = 0;
+ 
++#if !defined(CONFIG_CACULE_SCHED)
+ 	/* We have migrated, no longer consider this task hot */
+ 	p->se.exec_start = 0;
++#endif
+ 
+ 	update_scan_period(p, new_cpu);
+ }

sys-kernel/xanmod-sources/xanmod-sources-5.10.3.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+ETYPE="sources"
+inherit kernel-2-src-prepare-overlay
+detect_version
+
+DESCRIPTION="A general-purpose kernel with custom settings and new features"
+HOMEPAGE="https://xanmod.org"
+LICENSE+=" CDDL"
+KEYWORDS="~amd64"
+XANMOD_VERSION="1"
+IUSE="cacule"
+XANMOD_URI="https://github.com/xanmod/linux/releases/download/"
+SRC_URI="
+	${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz
+	cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}-cacule/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz  )
+	!cacule? ( ${XANMOD_URI}/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz  )
+	${GENPATCHES_URI}
+"
+
+src_unpack() {
+UNIPATCH_LIST_DEFAULT=""
+	if use cacule; then
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}-cacule.xz "
+	else
+		UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz "
+	fi
+	kernel-2-src-prepare-overlay_src_unpack
+}
+
+src_prepare() {
+
+	if use cacule; then
+		eapply "${FILESDIR}/localversion.patch"
+		eapply "${FILESDIR}/no_reset_on_migration.patch"
+	fi
+
+	kernel-2-src-prepare-overlay_src_prepare
+
+	rm "${S}"/.config || die
+
+}
+
+pkg_postinst() {
+	elog "MICROCODES"
+	elog "Use xanmod-sources with microcodes"
+	elog "Read https://wiki.gentoo.org/wiki/Intel_microcode"
+}