Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!151
This commit is contained in:
hedmo 2021-01-25 18:46:19 +00:00
commit d4b8d23fe4
8 changed files with 70 additions and 110 deletions

View File

@ -4,6 +4,7 @@ DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d0
DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
DIST v5.10.10-lqx2.patch.xz 513472 BLAKE2B 10cc5638ab22aea7211d32a46d4e4b16c1d4e02c98667beadd0a058f6ed98ec747263c99e67a381b207e71368e3a70c095be694dcd877006d50ddb36bf888b1b SHA512 c2c1daa243d6520237b58981bb9225fa0f8065aa8267aae6908a8d5bfc8928a298b9793d6492ef98bdf79430e11a5ba91fd4acb4db2db99417bdae5cc9b896d1
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.10.6-lqx1.patch.xz 350852 BLAKE2B 1a49c3f8c7e1d0d18271f43c748decc61ed6b64fe70fda7ade63f860fd3fd385fb34efaea88f2a671ad4d3d67bca7ad9bbfbeaca96e83577c94655e2ba37f4b6 SHA512 6603808dd11b82a04988fa335e4b640101d70ddccc32fd9b1c112cc25ac59649d315df5d67b3a1b3362e8beb260882605d25659447bbaac0cd1c8d7dd50cdc84

View File

@ -0,0 +1,33 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
ETYPE="sources"
K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
LQX_VERSION="2"
inherit kernel-2-src-prepare-overlay
detect_version
detect_arch
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://github.com/zen-kernel"
IUSE=""
DESCRIPTION="Liquorix sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
LQX_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-lqx${LQX_VERSION}/v${PV}-lqx${LQX_VERSION}.patch.xz"
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${LQX_URI}"
UNIPATCH_LIST="${DISTDIR}/v${PV}-lqx${LQX_VERSION}.patch.xz"
UNIPATCH_STRICTORDER="yes"
K_EXTRAEINFO="For more info on liquorix-sources, and for how to report problems, see: \
${HOMEPAGE}, also go to #zen-sources on freenode"
pkg_postrm() {
kernel-2_pkg_postrm
}

View File

@ -1,10 +1,8 @@
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.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.10.10-xanmod1-cacule.xz 459912 BLAKE2B dfc0ee7527298412346aef8330fdb3a450f9f7a6ba5b3f53c3a5d0ecbf1400e36d99ede4b0aa8497669647409d8d9489bddf42d5eb1c176e57c4e06f3fb1d363 SHA512 d5183d07069ef81b74571ad704374cd6a1bdbb70ce0ab86e57d06cf38488364f1c10bc0c24a8b279cef3da603c1eba8f001f0160d9bc469d898768511172bef5
DIST patch-5.10.10-xanmod1.xz 452512 BLAKE2B 3c826cce43695439430a687d85eb2bcb73fff532f116c26171b4ec4e30c1eb1e6057ce91f2de17170ac2e53d85e62099741bad47cadaef0f3a062f2ff91e696c SHA512 0fcc0996232ea2ddff8a278d103629b8853be9f644014e2e74433e93c54509586bd63fbce466424bb48689575a5d59dbc78eb16fc2e3b7260bdb9507607773f0
DIST patch-5.10.4-xanmod1-cacule.xz 286452 BLAKE2B fb2f5c389a1e0810837292bd476c1f57d202e8b22eb8e9fe4895a9954070442635f1a1e8f53b55a28b09a3702d319f43003d4762f1772ef9dfca11984d5323f2 SHA512 07ad37cb2e186874b6c78278abc9653a200cbc95ce1229ff2b93425afa14eeaacd96d9dd8da4141d341b2f2dba9de0d6b6c47922a6f713a325d9caef0a231466
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

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"
@ -38,7 +38,6 @@ src_prepare() {
if use cacule; then
eapply "${FILESDIR}/localversion.patch"
eapply "${FILESDIR}/interactivity_score_fix_xanmod.patch"
fi
if use experimental ; then

View File

@ -1,52 +0,0 @@
# 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}/smoother.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

@ -1,52 +0,0 @@
# 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"
}

View File

@ -1,6 +1,7 @@
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 v5.10.10-zen1.patch.xz 538040 BLAKE2B 2c0ceaebd78107adf1f062a866a6ecb7cc7defcf7eb00ac9287974a6417da2431100c5bc3b23ee4ad47a2478c31c5843de32b73b64ab7928c8df019aec2fb77f SHA512 ee719511e43fa0c799a8b342254125f10cf88fd32999d63d8eb904e76b45d53af22722dd14fd3c36556713a39569266d69551278939b752580360c52ea6a3750
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

View File

@ -0,0 +1,32 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
ETYPE="sources"
K_WANT_GENPATCHES="base extras"
K_GENPATCHES_VER="1"
K_SECURITY_UNSUPPORTED="1"
K_NOSETEXTRAVERSION="1"
ZEN_VERSION="1"
inherit kernel-2-src-prepare-overlay
detect_version
detect_arch
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
HOMEPAGE="https://github.com/zen-kernel"
IUSE=""
DESCRIPTION="Zen sources including the Gentoo patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen${ZEN_VERSION}/v${PV}-zen${ZEN_VERSION}.patch.xz"
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
UNIPATCH_LIST="${DISTDIR}/v${PV}-zen${ZEN_VERSION}.patch.xz"
UNIPATCH_STRICTORDER="yes"
K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
${HOMEPAGE}, also go to #zen-sources on freenode"
pkg_postrm() {
kernel-2_pkg_postrm
}