commit: ed776a64baaa83ffa9f4a9742d58ccb98468aa38 Author: kuzetsa <kuzetsa <AT> gmail <DOT> com> AuthorDate: Fri May 5 15:02:23 2017 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Sat May 6 22:52:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed776a64
sys-kernel/ck-sources: v.bump (4.9.26 & 4.10.14) Package-Manager: Portage-2.3.5, Repoman-2.3.1 sys-kernel/ck-sources/Manifest | 6 ++ sys-kernel/ck-sources/ck-sources-4.10.14.ebuild | 60 ++++++++++++++++ sys-kernel/ck-sources/ck-sources-4.9.26.ebuild | 96 +++++++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index 398831f1b35..a423cb83bbd 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -12,6 +12,9 @@ DIST genpatches-4.10-13.extras.tar.xz 17340 SHA256 89ecdd76d177c1d667b803d33f502 DIST genpatches-4.10-14.base.tar.xz 280688 SHA256 47a11244c2aa812a2b9d05b5069905e953a061c736ccd8460aa24ea8fef69d5f SHA512 7cf7069c7df3cad7aebdac22cb00d2d566d1eb0c503e2fe39b7ed972abf6a2083bdd18442f0d4c99f28b2cdaf48c58b0f71751533629338d7128f31dd5663b74 WHIRLPOOL 229569dcb0532c51207cfd2e86f2ff66539ddf7ae89f0eb933f53fdaa33ebdb68da8b04a28fe95743e6f6aaf4244c51034ae162d2ad53293f6b4f4493b981f06 DIST genpatches-4.10-14.experimental.tar.xz 105388 SHA256 20512ae33f788ade4b2ccf2fe55e90c57ea070036259274a84e60bfe5cbae9cd SHA512 1a5d1de8ee74a68dd8a20fe640b6342154d8b2e4354d25648a16fd4dc35de648958891fc2ca959bf3045f6eaf1197b4d0b7c7e45561881d312d018cb171bda60 WHIRLPOOL ddc8c8839705463fa826cc1bb82a378940351275d4f7eabedb2a81793564a4ce8aa8379bff9c1459e91fde23f9ef4a4c58ae795cd245bb1994e0558155d711cb DIST genpatches-4.10-14.extras.tar.xz 17348 SHA256 a5a81409396a9e811bcc1e6056eea181207e37adfb8cd1aaa85499810f3c1db1 SHA512 890eed4fd6bdf822320b92219c03712903269c5f454e341b2cfc048482c0856ef1aee832f3ba369bd99c91bf7050ebea37a51b75b867644a7e3b9c1dc3530f66 WHIRLPOOL 38e8783dc65c77ece12d9ea3e18f3902c198ab587c3c949a9f36488267c7f1bda779d8794ba7238104253040d9654f828ad451eccffed9f5fb15642ea0dbd90a +DIST genpatches-4.10-15.base.tar.xz 297072 SHA256 ed5febe4ddebc77b702e6377fff621a9280913ea480f78fbff74bcb50ee0f282 SHA512 689194e08fae6a7bc777bee7989064f4efb37ea340476e09fa7fd629ac45c0d5d7a2637ed95eb92b8bde0a45727b610288e573388024ee15b431a780fab33e7d WHIRLPOOL 61ff87ac1c41ff739e8ad081aa6afb3971c8963339046cab74570dcf4ba6a9a1774f182c2e7b07c050a25ae5d30f52cb4fa8954793b8c9797a2b663b85c9d85d +DIST genpatches-4.10-15.experimental.tar.xz 105400 SHA256 1adebb8f9010a51de20ca8f7ad2b4acf67b91e3478689070201b9b01352c7754 SHA512 600a61a214ce6ec234072319635cdf619d8935226ae387c7f7c4c8a8965408a66c50575f0bba5f837705963469b4f1eed3407d0ecfbd67200c8664a3f86414b1 WHIRLPOOL 66c2123199a20a17323c78be6459aca1a8e680b093b81da07996f3ebd256e335a7a69723a4068fbf95bd6c71b8758df4fa9219ce9a78712c9973a30f32218b33 +DIST genpatches-4.10-15.extras.tar.xz 17344 SHA256 a8e82b18ec6263b107065e69b98de016476b89eedd2cb6b451975e5842aea715 SHA512 f5213b36ca334164db9262935b08a0635064bc22bba668e27336281a71be06039efc6ab3cd10c806dee474a44cfd87baac063db91574597942beb52b1cbc7b2e WHIRLPOOL b5b9483235869c003909d5c778838e0fa08be63d386816062db605d528c83bec69c3c1d7b555467500c756588ba2c61bd47ce882b17d9901f828551b8229c843 DIST genpatches-4.9-24.base.tar.xz 535872 SHA256 b5982f25edcab736a3448d396bce03f5f52c19fcd6f253f9125dee890ccdf4cf SHA512 ea033acf6c63b3da5e15c7889166b1995e494a588fc406c72b70e46172fd9c2cecd1404a00d1f33c776dca2fc70226e4d9dd017fe1c35bce9f44d71433887f1f WHIRLPOOL 98ff1a195d106504fe1319e52dde7a5b3d715afdd2b74a19b509624f3461895b5e09092a644b96b4fc653e0b2b12ec1f2b38c93901bad1c871c026b8ab3dbf5c DIST genpatches-4.9-24.experimental.tar.xz 106380 SHA256 dd736139a5889ac682f71a4bae021306822757da089baff0e3f8925a4c89694f SHA512 d6578dc11bdbf2a67c2590b748491fe09337f40e4a32be3f5c5e1db8153fa680f1afd156b2ea6d70a4ff99321165bd4886749b9f992a43555a03a49d94f6090c WHIRLPOOL e961cb81f6bbdc88192a23ce397f53bbfa7210e7d132849071d7ce5f2f38829401ddf99ea128f8a7f04853f878912008c164027b5f3e6fac46d69f1d4b47cc79 DIST genpatches-4.9-24.extras.tar.xz 17360 SHA256 7427dd7e31491ffaa51be08bb5517c507018b4e73a9bfbf6a3558f27c670c885 SHA512 2e60a0b5f8a202502fd42f4a2a0b506d0fbe971e934aac979021077df812554725cb16496ae6d45fcf4223019bc6d35bb0d3bf45fd2462384fd5f769ac88c3ed WHIRLPOOL b6af4c3ee7e12f2d1ce37e19a694175ca68f54e79f672ae4a5d563e2a32231f08f224808afcd6223f4f88eb5d71054104ce968c1946a3d941d95a0897e20f504 @@ -21,6 +24,9 @@ DIST genpatches-4.9-25.extras.tar.xz 17340 SHA256 89ecdd76d177c1d667b803d33f502a DIST genpatches-4.9-26.base.tar.xz 563020 SHA256 2fdd667a8924f924d8b341963ee737564de7f075334344a3f3e113cf9b7974b6 SHA512 9f43a3ad5f6776f0f8c28d1a6048a06969b760a3e8265b4cc3d6abcb908a800843264888c533a1a6350a4d6eb49da04b66f6a1b03014742583e9f1cdff341688 WHIRLPOOL e8a07308570fe525447f87177b4e72a4c2cc1f9724a418647e2e316b96624196033f226ecba8affad1707382d155efce05af723a1033d461681a39b63d6623f8 DIST genpatches-4.9-26.experimental.tar.xz 106380 SHA256 d916ff32e3062cce15b0d791f37ae0879f705aae0332d925c9dc3b11a4056e2b SHA512 713190bced05a544df5527940844f456ea32318fb4f6409d4a022d39331a9a100d38a342ec1978285689d64dea47ae4f3c3a7ec725ad45cfb9731b11f99e597a WHIRLPOOL e0eadfb3fc68fb32642597fc22557db6a0042ca1e83408cd237d087ec1823453f47467f0778f87749b1a4ea2ced356bf91b881bd06514e7df09f150596d9402b DIST genpatches-4.9-26.extras.tar.xz 17348 SHA256 a5a81409396a9e811bcc1e6056eea181207e37adfb8cd1aaa85499810f3c1db1 SHA512 890eed4fd6bdf822320b92219c03712903269c5f454e341b2cfc048482c0856ef1aee832f3ba369bd99c91bf7050ebea37a51b75b867644a7e3b9c1dc3530f66 WHIRLPOOL 38e8783dc65c77ece12d9ea3e18f3902c198ab587c3c949a9f36488267c7f1bda779d8794ba7238104253040d9654f828ad451eccffed9f5fb15642ea0dbd90a +DIST genpatches-4.9-27.base.tar.xz 575444 SHA256 a0a3b29e69bf3c9bcfff10817cba12dc6a43b9ef8375120a2510b965ccecb78c SHA512 fdb12314dad10086e4c5d26617c44ddafb552e4362195102bfdf68e5b6a0408fe26c5d7d6d04b9e4b929adaa4e804b9b9bb99a2be6dfe31d58f56612d9b59d7c WHIRLPOOL 870b6f518f49543ea557eb4d686e04d446f14424d3fdff2799708ae39d46cba28a4974ee131098332ab00913797227de5ed8cbf15f83fb5e95e28c8d91956f0f +DIST genpatches-4.9-27.experimental.tar.xz 106396 SHA256 aaa23a58e0cd7284fc3f4a01f24b96e683db49a1b90a3cb3984b3b3cd614ca22 SHA512 8676a26f75ec6481a260bfc41247e7aa3ec5ddb663915db9225219b5b02f6b0f23bb5228aff1aef87bb72061c80c68f62877be2b4280703865dcc74cff2c12b1 WHIRLPOOL 427d8dac9855e585f40600e65bcf1bc934f7084386564881edc77b06ef97127334a9623105cf72e372dac09f00ff3cd9e871e067ef4a7c3d90749b996894dd79 +DIST genpatches-4.9-27.extras.tar.xz 17344 SHA256 a8e82b18ec6263b107065e69b98de016476b89eedd2cb6b451975e5842aea715 SHA512 f5213b36ca334164db9262935b08a0635064bc22bba668e27336281a71be06039efc6ab3cd10c806dee474a44cfd87baac063db91574597942beb52b1cbc7b2e WHIRLPOOL b5b9483235869c003909d5c778838e0fa08be63d386816062db605d528c83bec69c3c1d7b555467500c756588ba2c61bd47ce882b17d9901f828551b8229c843 DIST linux-4.10.tar.xz 94231404 SHA256 3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b SHA512 c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 WHIRLPOOL 86d021bae2dbfc4ef80c22d9e886bed4fbd9476473a2851d7beaf8ed0c7f7fbc1fa0da230eb9e763eb231b7c164c17b2a73fd336ab233543f57be280d6173738 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a DIST patch-4.10-ck1.xz 154200 SHA256 1913eeb921bbef3733b53f4004a3013289fa85a26409610bb14fcff3bbd7ef72 SHA512 b998cfe44b5bd89b362fe299ae799cd5caceef5114b954fbf10be0553c21234a949417459f848e75b029a4089760aafe212efadddd8c2d65d054c0d367fc7816 WHIRLPOOL 2056718b1b1e1b8bccfbe5fcafd01d24179fae05653fac3e7553b4dab38789f694a050990e8e99ea38c4f9074ab339640980d433bdd411c0deb84f7bd698ab10 diff --git a/sys-kernel/ck-sources/ck-sources-4.10.14.ebuild b/sys-kernel/ck-sources/ck-sources-4.10.14.ebuild new file mode 100644 index 00000000000..63131d566de --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.10.14.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://users.tpg.com.au/ckolivas/kernel/"; + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="15" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"; +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}" + +UNIPATCH_LIST="${DISTDIR}/${CK_FILE}" +UNIPATCH_STRICTORDER="yes" + +# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag) +# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +} diff --git a/sys-kernel/ck-sources/ck-sources-4.9.26.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.26.ebuild new file mode 100644 index 00000000000..c1c9d822c2a --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.9.26.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://users.tpg.com.au/ckolivas/kernel/"; + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="27" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +#-- If Gentoo-Sources don't follow then extra incremental patches are needed - + +XTRA_INCP_MIN="" +XTRA_INCP_MAX="" + +#-- + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0"; +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x) +FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc" +FRZR_FILE="${PN}-4.9-freezer-fix.patch" +FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}" + +#-- Build extra incremental patches list -------------------------------------- + +LX_INCP_URI="" +LX_INCP_LIST="" +if [ -n "${XTRA_INCP_MIN}" ]; then + LX_INCP_URL="${KERNEL_BASE_URI}/incr" + for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do + LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2" + LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}" + LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}" + done +fi + +#-- CK needs sometimes to patch itself... --------------------------- + +CK_INCP_URI="" +CK_INCP_LIST="" + +#-- Local patches needed for the ck-patches to apply smoothly ------- + +PRE_CK_FIX="" +POST_CK_FIX="" + +#-- + +SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}" + +UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}" +UNIPATCH_STRICTORDER="yes" + +#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches - + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +}
