Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!148
This commit is contained in:
hedmo 2021-01-11 19:13:11 +00:00
commit c56b2ea8bf
7 changed files with 63 additions and 36 deletions

View File

@ -6,7 +6,7 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
DIST v5.10.3-lqx1.patch.xz 133084 BLAKE2B a69e2a0635acbcba9cc7b8f63afb80614d49284b2b42c8aad06c2a9eb3041d1d420f096e734b1ec7bbc35f1286c38ce643a42c953e7d6f000babdd97e36830ac SHA512 661f7d716b8e34ef093138cb143a871233aba772e12bd49698f27479965003f244ecec566148275e5115942b656fdde2de3132e68652cd410c91082816bdeba5
DIST v5.10.5-lqx1.patch.xz 334676 BLAKE2B b0cd14cd7a0bb373583bbb6e114b8c9cc9be2bc2bfd4ba76dbdcecc1a9005283969e06d0e49cdb7450a9be0b848ff73b0d3ac66030e5cc8082a398eb1abb536f SHA512 c3e8b51b77df1e8a2c76f63cf9e92b202b6ea0fa3499869ec3d8eb7cc38f7dbcc77654aa6af6749e14615128a706fa6b8607db31c046537c55cf8c69d3eec8b7
DIST v5.9.12-lqx1.patch.xz 722204 BLAKE2B 4f8eabd4a0c6f9202f5f020f1dd5eb3ef9211e24b68550aebeba4574117fa1f9fdadc55aeb98bca2d91c66e247a2ef7e139b582cff77b23165d3965b79b623ae SHA512 bf3203c071f315968382b8f8eba449ab3cbdf0a092788bf8d85195c86ac3baf586a558ebb6c3dd59e5a4b10d729e71ac23824ccb4c1803502f733a001d0a4d54
DIST v5.10.6-lqx1.patch.xz 350852 BLAKE2B 1a49c3f8c7e1d0d18271f43c748decc61ed6b64fe70fda7ade63f860fd3fd385fb34efaea88f2a671ad4d3d67bca7ad9bbfbeaca96e83577c94655e2ba37f4b6 SHA512 6603808dd11b82a04988fa335e4b640101d70ddccc32fd9b1c112cc25ac59649d315df5d67b3a1b3362e8beb260882605d25659447bbaac0cd1c8d7dd50cdc84
DIST v5.9.13-lqx2.patch.xz 743624 BLAKE2B 4f21723e1b6a57c070611eae06c43dd09c55e38c344e1477633181f6a4c2a12b1bfd1acdf1dc8e989c22ebff429e770e0465ba5933aec15058ac2a44693505c5 SHA512 5dbc6db35776607b1f625f62324b3ed99fe09677a9016b1c259e51b5163f78ec358b94c62fe2878e1efa39c8bfbc9fd673188573b7149d17a773e8fde6eaec91
DIST v5.9.15-lqx1.patch.xz 777072 BLAKE2B fde54a06c99f463d44865d99d17d0062bbc9b3d3b2bd341a0add0f13d9b53defe9180d50f5e7d5238f4b593c58a111d750c1f28232f5cd78325a03cee5068e4c SHA512 e48cdc3a9761559d4e1c529c5db57ae5cd624792f8fc56d7279c1c0f19306f7661ce410998f8eaf29028942d3224b1f669b88ea7f6b5aa6d6b956cc8a9019f32
DIST v5.9.16-lqx1.patch.xz 790204 BLAKE2B cb03edf4fd2326dd063562d36967c18bb68f94e669be47ea010389c87a78eaac147c5727c715e2fdf5e22aeba8c1b5c242d8fe54052e5bd8882ea58dbe5c07a7 SHA512 13388a2e68b3300641d670a08ecebcec1128d8419e3b04cc6ac84ddfb30043e9ee2803b6d1b27b858201b9a73c2536cce6743ba2f08e33a1987c3454065c67f8

View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"

View File

@ -1,7 +1,6 @@
DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
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
@ -10,3 +9,5 @@ DIST patch-5.10.4-xanmod1-cacule.xz 286452 BLAKE2B fb2f5c389a1e0810837292bd476c1
DIST patch-5.10.4-xanmod1.xz 279076 BLAKE2B 49074b019705d001bf04358bf010dc0957c2b8917a38bc2e19a4e3a42ce5ce3820c0f9f60f7472c906244f91136d9412ebfe9774d4a0102692ab1560e344c89d SHA512 3f86b65fa856aa2e56255051efc2f523a0361435b8fc10d0f63dfa3bbda5021330278bf1952d971501dfd2c86e945a1c7c0b9af068a7f8d75053d10730319754
DIST patch-5.10.5-xanmod1-cacule.xz 338976 BLAKE2B 327af0edc5d62efdda58490dac449edfe0035e3eb6fa87726a38a549da12e416e2b501987fa258111425b2639b1a5468e8108cb791b5479f4de9e4eef8c85e4f SHA512 38c2a3f533d960b2bf1b2a42967ad56bb5692941a9531fe262fa96bc81c6fe923ab09dc7d7d0c9a009c074ec1fd17dc00b43400f16757e7ac9a8e8953b66eecd
DIST patch-5.10.5-xanmod1.xz 331808 BLAKE2B d081db46f12e6c5a49865a2170f458910212b643c6a423c47910077259ebc897a54baaa7e4a3034d06a173260539a25b51ab6cedc1bfe54f63cf7430c8a2d71a SHA512 83e93bb6f424ee4fd53303c6432649a64ed44b4cc1a14af82b23a4593aa97a1404e847df51a9dfa8195c52e546683dbc9989904fdcbb2aee943c073a435dd9ac
DIST patch-5.10.6-xanmod1-cacule.xz 349164 BLAKE2B cb54f0e2c9a4a6a0f7066b3c0e0cbb561633eb74307f333bd44d98b41db77fca4b981d85ddf22adce6f2eff8b7a2fd46e72e1f11a59b643e1f169f0f114ec325 SHA512 3f3cba4e8eafbd1d9c05d86f8e1c6675a42d52b85c57be581c046d57cd6ae1a3095a07a482fd3b77f3f52299dd5508c4744bc5d92cd67aacf1a04740fc9cf206
DIST patch-5.10.6-xanmod1.xz 342188 BLAKE2B 93cca375086b5a081cdcef69189a0bdbe710cad97755c91c823221aeefcf3ec4d514036460e49cd9e3939633e9cc96e0723d4673d3dfdf68d25fe8cc14e171ef SHA512 d421447f793661b72c676731c32c78a7c2c0873a891cc660566b6247ac0e1c7c3985cc37ead7edd7a89ffef51927e09e61c850f238277032974ebf517e99730c

View File

@ -1,31 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
XANMOD_VERSION="1"
ETYPE="sources"
inherit kernel-2-src-prepare-overlay
detect_version
DESCRIPTION="Full XanMod sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
HOMEPAGE="https://xanmod.org"
LICENSE+=" CDDL"
SRC_URI="${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz https://github.com/xanmod/linux/releases/download/${OKV}-xanmod${XANMOD_VERSION}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz ${GENPATCHES_URI}"
UNIPATCH_LIST_DEFAULT=""
UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-xanmod${XANMOD_VERSION}.xz"
KEYWORDS="~amd64"
src_prepare() {
kernel-2-src-prepare-overlay_src_prepare
rm "${S}"/.config || die
}

View File

@ -0,0 +1,57 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
ETYPE="sources"
inherit kernel-2-src-prepare-overlay
detect_version
DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo patchset "
HOMEPAGE="https://xanmod.org"
LICENSE+=" CDDL"
KEYWORDS="~amd64"
IUSE="cacule experimental"
XANMOD_VERSION="1"
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"
fi
if use experimental ; then
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"
}

View File

@ -8,5 +8,5 @@ DIST v5.10.1-zen1.patch.xz 35268 BLAKE2B 69b75dc5eb69cf4a57941d429e42416b2720634
DIST v5.10.2-zen1.patch.xz 38964 BLAKE2B 8596998d6cb2362b71194f6c8091fe61669698efea857f9438e4afebb521c9c3be298f94a280401109b9ba75f75245a751453fcb5ab8571aca7a2317c434bad5 SHA512 9b9eb8e9453efb6404933cc44264762790e79b6fabc56cee14cc7d8659b6be8089100d4ebb3af3e414fea2db2aa6de9118c5366ea171e02265c7fb2afe2a7605
DIST v5.10.3-zen1.patch.xz 52312 BLAKE2B 157e08bc74a55c6e6e86895100ef09380251d86be436cd19ea06c7d6a49ad8dced5e128e863bf3f63c8334191c3e460617b4d9c68cbee49cf9781ede77dcf3a0 SHA512 8b274276a6b5c64a105e36a5456edef6a5a2a4419c4fcb6a2b6548bd8fca2f0ffa523e3105bd2486f17cb8460ae22226bc34b18783298da4b9cb322e92ef7356
DIST v5.10.4-zen1.patch.xz 349804 BLAKE2B bb50930e24ed9028bd2518056e4e5eea503f4d3d6153d65e04adb22c660cd42e10c64a13a7c10248c7bfc51f4ef36350c7f7f8aeb2c434fed750d9c8175252bb SHA512 cbec1f3e12a0601bd018d90a52e16dd9b225e4d8675435722afa613ea98eb33c1bcce3d631dcc18b7a6f046c0fa12be0acf2bbb9a09d5e259f2ab325ada46148
DIST v5.9.12-zen1.patch.xz 796072 BLAKE2B b8bbb33298ab5d236ca7d1b2bef99da7c79cfb0b7297a996a329affb96a917a267102339460b54cb097d0d40868a357b260a46278458cedc04190a5c8c870767 SHA512 1f88498d1f547f59aaa59a6ee938fc72ed8b90cec46526c4c8bd377d3b43a76a4990740fc2869017f52f0b56393ae43b779c399b2acfa75f3e00dc9b4f53f084
DIST v5.10.6-zen1.patch.xz 387460 BLAKE2B 0e42109335d0c8d7344b8afc3addbe20c92952eea536df4db0152607dcc97d7de142124f9cb0c22c52af01bd6c117cdc69c51f36725c0f2ab2d51165a2390a28 SHA512 3ba03f703521083e629911ebf980545daa34d73aba30aed8e7355eb315d89728f322df0a3791663fa5fbe398bbd1d10951518d81126e077cf50c9fa1d34563dd
DIST v5.9.13-zen1.patch.xz 806084 BLAKE2B 93706195979daad6037fdb3be9c1dbad516fb4db2c59076e0e80f43092c25e950b53e8e315cd748a4c235968a4aa6653f182ecce86fb38193666a4cc2484e086 SHA512 6b78e36f222cd756a42f66017999d128c0b5fc9ebce929548d5812f0dd0284ec2f097d53f680e24ec81cfdd437361a894955851e037c32f415f0578afc2b401c

View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"