Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!156
This commit is contained in:
hedmo 2021-02-28 16:01:04 +00:00
commit 9df5fa1357
8 changed files with 5 additions and 139 deletions

View File

@ -8,5 +8,5 @@ DIST v5.10.10-lqx2.patch.xz 513472 BLAKE2B 10cc5638ab22aea7211d32a46d4e4b16c1d4e
DIST v5.10.12-lqx1.patch.xz 543216 BLAKE2B 00792c5a9f11ae686de91958b832dcb0b94028bc8fbab62b098ab8aca7a3b99a604093ffc94afdda934358580202e38fbc3ad1a4ac04a85737574363ff850b9b SHA512 284cd1f483b5cf6ff69426eb1c1c87c5e2ea3c9b1d9a7ec272d0ad0f2375a7dddda540c6e75c3c33a98183c687b41af5c9f89c2df3091947dc187645ebd42f7e
DIST v5.10.14-lqx1.patch.xz 591956 BLAKE2B 9aa7eab7b55d2f9e02f336ca70877b204bdbb106d0d02457459ea8408effdd179c12def01575410e16db987fee7cb79cc17d520a5f80712119402253619f3541 SHA512 42ee30f7d4253f47b814493b0ea22a971f564fea7fa66180d02d23d6fba0e6c44a5d76764da35f46dfd739b3a72bc41cee57296ae1871f3738d8c2c1fd5a4c6d
DIST v5.10.17-lqx1.patch.xz 663712 BLAKE2B bedecf8374be91f54279561c06170e991c0aa1b576049bf3796ced38ec90dbab774348a403bf4db8bbb06c9704172b5520fbed5462afaf5f6d85b7331d66b578 SHA512 9b1cc517e81a366c5da5c721dd409c7a5d8347e801285559db7bb04e614645c2e27a11ece838e29be9cbd722444a9132270bee0c44259a8f37764bc8bee510ce
DIST v5.10.9-lqx1.patch.xz 473408 BLAKE2B 3d92b4a85e0f2b1b1a3f7d46e1ce4e26821ddb171542d9e586ddf9ad1d7fe317b8d4c7b1ae6ccc1344cadbfb7734aacf90eac0e8b01cd228979b9ec341362892 SHA512 d44f1a77313b73837e5a499f5dc406404700cde3e9c3beac58028c590bfb94579901d8da055f4c6324fcef4d65772bbc0a4b322ea5f7a319326c66cf73f0dd7f
DIST v5.11.1-lqx1.patch.xz 169392 BLAKE2B 68011ef65da7b4209b1693d2fb135953a7f058006f9e4349b76a28c25f2ef9f18a8aa33ede42a68cec5d406592ae39fcc3d3cba052237e878ef2475c64bf42cb SHA512 7935dd78517574eb40454823e6275d683764f0b7599b76e7de9bf457ee502f2ede639dbe63b5e5c57e4d626d2dc1154433cf3f9c5b93a474922ca8d4e4cbe134
DIST v5.11.2-lqx1.patch.xz 172692 BLAKE2B 2412b22eddf7adb9ad5113ae534dac7f8d79d91d6c6c1614f8bbca01f7b56cddb961fdf21e54e6b22ff3c9842c141004dfba6b04d7343b755214b48a99077082 SHA512 fcee31a48107dae8f00128d81cf5f647a91231c83293b8e9a79eb1d869e1c923c61de350ff2941a74ae3c7f4f18c3f9815160eaa3c6afb3fc7e47d4b8d82ba7d

View File

@ -10,11 +10,6 @@ DIST patch-5.10.12-xanmod1-cacule.xz 515924 BLAKE2B ff36fe9df894a179372de5ee3c89
DIST patch-5.10.12-xanmod1.xz 508588 BLAKE2B 273cef83b87d0a772db73683a5decc40addccd70e9d301b6fcc6da1d89e55c7df5af4d99135906daa4095e39d4dbb1561190ffbd3544d8899b581d6d7f3f8269 SHA512 5c13f2af2f8ee1f970ae5863069f2a1ba738b928aec13b9fe353aba8a1bf06860d8f8ff38986a7188034c20f0051ebad50021c8561e0dd8ebdd0712dddf9b2ba
DIST patch-5.10.14-xanmod1-cacule.xz 565148 BLAKE2B da0dd2cbc2e33787b078e0ce710d7f6a006691c7b4e555be997a92c8530609a34462e8adff949eb218d3b8cf6ee335df2fc82591cc5c58c8fa824871d633d52b SHA512 0e861857ab861f0981d31e5394af28ce2e4791ab86ce8ddf556526a8d2d4598176f77b9f6f737f2e217d4831b209ad85acf62e0d25801db0210a6e5312d88fef
DIST patch-5.10.14-xanmod1.xz 557856 BLAKE2B 00ef644d4ae76f90e78c94c244f17d1957671530534e4a0fbebb8dd5c6b762da02151e18d04836ebe516a8253901fb77309f6f7dfb0fab96162e9eb572e60878 SHA512 0387bd02f57fe9d4b1c88f37e5c7fe8d8eb56c2fd47bd176148e1733692300b6a4f1e0ba781bfd13227a08e14eb018219d49d08995ac489c525be792cf8ec36e
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
DIST patch-5.10.9-xanmod1-cacule.xz 449056 BLAKE2B 902dea113a915ed564e4975a18e6510e88bfc8df169ea1924df15f52cfee2d0d8235b6558ef2350656dfa7f0cb756151870ebef66b45828578c12674f450b972 SHA512 e87209e3a50e20590b5173f145c5d3fd9f43c69f6c94f80c6bc84f39201d790eb95785323f10af5f4d50f806f05d1ab59f7ce6fef8e40d19fdc7ea5f6c034d0c
DIST patch-5.10.9-xanmod1.xz 441992 BLAKE2B 7eec9aacdc7611355b519f9e06ddd9ebd029e666924bc6d03cd153029b474c72039cf730d1a1150b9505c757e0da37d1787aefb9ada1960c9457a478ec00f1af SHA512 2fff3f5918d41810f993b9f5669059818f60bd83ebcd99985d576a9521f4005929a42e8eca0001e2a9cc358159a1603e6d2d76617352c8be0644caecfbe9f1b2
DIST patch-5.11.0-xanmod1.xz 110924 BLAKE2B 1a8ba61a55a8111e836383a0df5e45649d67352128e13001a66cb223f4fb378b4c9f686cd74da0f3baf93551a665a1284f563331a3ecdb683252960fbc979c28 SHA512 c32eb1817ff42906d7b5986a8771f1213f908b4aa74736faf673291550a3def97a99064e2ccadcb75d250f20b1df3a84002d15b475a9ea7deccdc17dc267f0c3
DIST patch-5.11.1-xanmod1.xz 115624 BLAKE2B ac78602a0163c22f5b3e63a4c0c190e5ed01ec8a46653ec73bf1b656833e701867f77d38458f475ac194c8538f9290ef884c5b33e6736860f5ab751bb1396f77 SHA512 8c67006af22b69702ffd2de62fec6a202d824313e9e3d6516bb8c83bffd1125507b5cbcaebdd002a09f92492a47051755f71bd8576cdb717d5284a4dcec4f5cb
DIST patch-5.11.2-xanmod1.xz 119096 BLAKE2B 065240dbe21286bf3f3d146cc8bb19d253796ec0e8a2089c0c080fa3ca1aaecaaf1ffe7a5c60a3a8621df5018af4ae6e684655647e66a542ce09a62c6e8a276e SHA512 fd2744e2b6b07ceeac345dce48ffd03e3e815792446aafdf7d8c18101e159c69e4e9e5f6bca949b2a68a7b922004620f8b8c89590612b50d3fec54de590f5025

View File

@ -1,57 +0,0 @@
# 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

@ -1,57 +0,0 @@
# 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

@ -14,36 +14,22 @@ DESCRIPTION="Full XanMod sources with cacule option and including the Gentoo pat
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 )
${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

View File

@ -7,5 +7,4 @@ DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e
DIST v5.10.10-zen1.patch.xz 538040 BLAKE2B 2c0ceaebd78107adf1f062a866a6ecb7cc7defcf7eb00ac9287974a6417da2431100c5bc3b23ee4ad47a2478c31c5843de32b73b64ab7928c8df019aec2fb77f SHA512 ee719511e43fa0c799a8b342254125f10cf88fd32999d63d8eb904e76b45d53af22722dd14fd3c36556713a39569266d69551278939b752580360c52ea6a3750
DIST v5.10.12-zen1.patch.xz 603272 BLAKE2B e24391f8e718384b97acbb542b74544bafcdff028fffd303e50f5b3eeac80c519520ffa357824865fd5f1a5907786099f58be735ae59f02dee71bcad78740b32 SHA512 04e0298a686916448329d3e98e454dbf53fcba85ae4513af6390c6ae9687e63938859dcc908e90b171ef91d451d5adbe6934df331888aa01ae85f98f14bb5057
DIST v5.10.14-zen1.patch.xz 655668 BLAKE2B efd0d1d0e95f556a69e64379a079c776fa2e9000f5d9274d998b8dd3ab2f0f7be2173fb716468e2b901c7f5ae64b5660639b7ad58818208d5af5270aa5dbdc33 SHA512 e51bd453f33a4070c19c0d2180df6bdb9379bb6a14543a98d1b7a51cd421ad47ef391b4ee9993450c607d16dc41e63f10a3265640e09b59c42ad88d5bd35b937
DIST v5.10.9-zen1.patch.xz 524672 BLAKE2B a2145e593589ab4133326f8c41714fa941d029bc85c26305ce850910fc191e849d03108a6c0cafc4673540eae4625d1a82e3e325dab9c0efc725863a86b657b9 SHA512 2f37da67143d950d693fa5d4e244d7f465aecb4d22191d252676cfd51d02388ea1206b3fe3eb0f2592a00993fbcefffc91cf70408583b5eace15de996362bc96
DIST v5.11-zen1.patch.xz 65512 BLAKE2B daa2d6f88e99dea76882f9e66046ccc54620ad3aa07bbf54987f92fefad051465bdfaefd53ca9603f9090b2c35e9a13a24b2d11a92c5c2b252c9e5acda231069 SHA512 e651745f947e589acfa86e1513fa2784d150500697182bd16a4eb35352d7d0f8515ede7b6e1cba9af8ced93c5a6cdb739023365159a62cb2b2b8acc6cb08b3ea

View File

@ -18,10 +18,10 @@ 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"
ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v5.11-zen${ZEN_VERSION}/v5.11-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_LIST="${DISTDIR}/v5.11-zen${ZEN_VERSION}.patch.xz"
UNIPATCH_STRICTORDER="yes"
K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \