[gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/

["Göktürk Yüksek" <gokturk@gentoo.org>]

commit:     33e1198263df22ccffa9cf5e81fa86cafef4c55a
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Mon Mar 20 07:26:32 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 16:31:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e11982

sys-kernel/ck-sources: v.bump (4.9.16 & 4.10.4)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-kernel/ck-sources/Manifest                 |  6 ++
 sys-kernel/ck-sources/ck-sources-4.10.4.ebuild | 60 ++++++++++++++++
 sys-kernel/ck-sources/ck-sources-4.9.16.ebuild | 96 ++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index fff63cbe794..df94067f727 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -15,6 +15,9 @@ DIST genpatches-4.10-3.extras.tar.xz 17344 SHA256 0d604227fd07cb97afe7ace9623d1f
 DIST genpatches-4.10-4.base.tar.xz 98432 SHA256 52901b9dbba814de20962cd90efcc0036730d349bc3c9d8acccf22338a0913ab SHA512 4e75f8ce8f3a143c50d7d08ca1a7aa3a76a2b6bd38d015b691286d885c514d8f118a66deca61cb85e07bcbe38efed51b1b4bcba3530429aee8c0205398352c32 WHIRLPOOL d425dcec43d29d0041fb1e6e7d1a8391c53806e50ff9cd8f971b4b5e741679bd1b6ef843be0de894987e4a1d909a2c19ffac7839769932eaa7359675765a7b85
 DIST genpatches-4.10-4.experimental.tar.xz 104588 SHA256 9d5c178123d311802793bd696fd521eb852a1cb660d14aaf3703b7ea814e433c SHA512 f15e876d306ac7d574071f07971aabe02ffeec91e7349cc3d403180212fcab6e42c207ece65c4929c5768d1bbb1c90002347aee27e85b214f7f631b7fc164cfe WHIRLPOOL d6fb36d95eb17c1d2a07dd41bb65fb9cd13e0c8c793787d4735fd49a756de6b929fc627c4419e34c627bb3d38a5d1931a960c3210915394c222763e70943ff41
 DIST genpatches-4.10-4.extras.tar.xz 17348 SHA256 64167f17f122f969476bf68a3e0493a77d7ae9e78087c2748cdfdc6e6186af2a SHA512 dcbdea379a0e28e9b8ed08b32ee71a36ce9ccc817e5b79f38759031e3324441f3e91e6b7e2802d1a694574bb4ce9e8f441d88ccbbd9280b3a4456eadab7d5fec WHIRLPOOL 1d3ba61d03d17a707a65423e85f7f3a235a9d39fb26e4602b5cf663e097dc9e8618380d7a54db60705e6b38e9c0674330df57a6e243c7215411275a489ab8b42
+DIST genpatches-4.10-5.base.tar.xz 111016 SHA256 f97bb9ca8c942d3a05a37898ebc7c6b92dbc02383b08854b365899510014f02e SHA512 d77627b086dd107486f23ab0596f537447453e6ff807b5b78931bd355d13e3c7b0cab0eef53d50ee83fbeb22453627472f7cb29941cc26a13c0c13bb55e2d6e7 WHIRLPOOL fba0380eebbe32c469a557dae50b5deea51087eeac7ce3d58ae6a64755a952995591ae8b985aae0f25101321e0d4c1ab9d4420a3b4c0ef01ecb1798f81721af8
+DIST genpatches-4.10-5.experimental.tar.xz 104588 SHA256 9d5c178123d311802793bd696fd521eb852a1cb660d14aaf3703b7ea814e433c SHA512 f15e876d306ac7d574071f07971aabe02ffeec91e7349cc3d403180212fcab6e42c207ece65c4929c5768d1bbb1c90002347aee27e85b214f7f631b7fc164cfe WHIRLPOOL d6fb36d95eb17c1d2a07dd41bb65fb9cd13e0c8c793787d4735fd49a756de6b929fc627c4419e34c627bb3d38a5d1931a960c3210915394c222763e70943ff41
+DIST genpatches-4.10-5.extras.tar.xz 17348 SHA256 64167f17f122f969476bf68a3e0493a77d7ae9e78087c2748cdfdc6e6186af2a SHA512 dcbdea379a0e28e9b8ed08b32ee71a36ce9ccc817e5b79f38759031e3324441f3e91e6b7e2802d1a694574bb4ce9e8f441d88ccbbd9280b3a4456eadab7d5fec WHIRLPOOL 1d3ba61d03d17a707a65423e85f7f3a235a9d39fb26e4602b5cf663e097dc9e8618380d7a54db60705e6b38e9c0674330df57a6e243c7215411275a489ab8b42
 DIST genpatches-4.9-14.base.tar.xz 299156 SHA256 a19e22f33b62858d28b2c78a3325f9334bd089bce9d077d6a759aa59a0b1a472 SHA512 4891b932bf0967e42dc047ca5213c2ece7a4e8347cdb0c176b0dba2063ccab0245d1f3f89ad9e184226a02870526a246cd1f291f20e2e0d4aa79d06b40edaf16 WHIRLPOOL 0490f84c21e80a0b80d2c851096e07a31cdd24bc9fc8b29682d84876155ee8c074d7f736d1b5c6f7512e4810d57fca649602e519feb96e325a732b7cb32623db
 DIST genpatches-4.9-14.experimental.tar.xz 105584 SHA256 a14fb8785a4f245cbcdc12557a4b2487ccb00e39763af17204557fbf81cb19b8 SHA512 34787219163e2443b558531f5c427463aa1c4e1131bf950bb6afc906af4d8e3c2c57b5361ce7745a8b77f7ba391d76c35cfcc58afa464ea3da0c693cc2058e93 WHIRLPOOL 16287aa781e7777120c95638c4d72c13e4c1d0820323a4e7996e58431e9ee34bca9a8970f0c6ff2a9815227a901b1cd1128562994d43e73779e57a3d5c37febc
 DIST genpatches-4.9-14.extras.tar.xz 17332 SHA256 2bdf94536e891c377ae1cc0120cb3f420cc84c7b5fe2f8070840d895f7e43ddc SHA512 53adb516ae85e00a99fcae63e668a268520b74314b626c094cba4044a2c443b4f340238ca03a27624b23d356678739a933d515c8240cc08c2c4db79be090b183 WHIRLPOOL d540140ae6b1edde3f34ebc19e7bba0cb0a05a8b7aed5be3c02f698ac40b6e713b249687f1d467553c859aca7e7e54b3901eeeb22ffedace8e6bd34e04000aec
@@ -27,6 +30,9 @@ DIST genpatches-4.9-16.extras.tar.xz 17348 SHA256 303d08a22a2529392ec183515290f6
 DIST genpatches-4.9-17.base.tar.xz 375092 SHA256 aa60be6abf48139e2f4646aa66a3f146bde37d06abbf2e5682986e480f11f3ac SHA512 1944972a8bb3677ea5cf8314757bc0eb970abea41b0ea923f83eb88fd99aaccb98112f24147542bae39c0da913f7c3be607980fa5fcacbb3a0c3e65ee2c178e1 WHIRLPOOL c876ee565d2171c7877e1a80f0500a5e3b8dc51c079133b32c82c33d1799c4600a25a96fa84f5636ff3391d18ac0f989c3784a2f885d0f66aec4d45d21e06a63
 DIST genpatches-4.9-17.experimental.tar.xz 105612 SHA256 2236ccc47ac7e0b7e77fd062de9adfb9f95ed44db26fed794965c4226e076249 SHA512 13ff54171516aeee99ef5643c6b486c3069184ac3f71012185fffad71ba822a42aa97651ff3a777c12748e5ce1555a60dd5cb560f34a0931911732f5fdbf9719 WHIRLPOOL 6d13a08ee0f5771307faceff5f5131a8958531efe9c9e3c3596825181bc42d990317f916fd038587b3bf6861d5cc7414a6b95537bca163a27db564f3bbc30165
 DIST genpatches-4.9-17.extras.tar.xz 17352 SHA256 7a61c27163b6f0b5f517a819b31ece63ce72a8dac00a1df750e0b80c652a3fc7 SHA512 cbc2c679741499b509102c95ff7f2ae9964cd3ab75c4f2902239573114dfdc0c676d9ff6922035ab39f141ef3d815224651b1d4d63280afad7e2a970cf146651 WHIRLPOOL 0e816fe3675bf26270d6be3c2f1188ba3e1048fe4b8c9b3b00867bac584dfdf2f905442977d87a4e4ca877bb9a1fd3144f7a9637d6e5c061a15fbfb249a391d3
+DIST genpatches-4.9-18.base.tar.xz 385508 SHA256 d29fc16842e846c2c6487e9c1543e6fe43429d34882ac9c6ca070c1fe3564605 SHA512 c1d08b3d66df74efe610cbf586921f7caa57bb8337848380fdc8e2034883180a60a26dab9ded50974fb468d35dc923912ead08cb0f751a515cef85efb31955d9 WHIRLPOOL e1ef981b945718eab2e96470f96a033cc2b1ede6c706d6cd3e32f4f1c4e066766135141d55a5ccee06d9fb84bc66df389cdb2d095ad569bd565afc600b3b4095
+DIST genpatches-4.9-18.experimental.tar.xz 105616 SHA256 209be56c1efb0ba3fbee17f2437bd00b36caecc6c44db2b4e1a0e46ae17640b0 SHA512 37d6983f46ed4031f11f91ffcdacb510b40cab682d71ac471ab3c2ae78598ee9826068afb8b1388d96133635ba2680cc106624e0d79c341d2610b4f74330b773 WHIRLPOOL 5af9422c0526c5e23977f2d25ea683ed1ecf6f9e14a6daf52490bd808e9790cf6f6d9ef96353bda3474197eb954159575a4f0e6a768a86777d9b8a61828d0a0e
+DIST genpatches-4.9-18.extras.tar.xz 17348 SHA256 64167f17f122f969476bf68a3e0493a77d7ae9e78087c2748cdfdc6e6186af2a SHA512 dcbdea379a0e28e9b8ed08b32ee71a36ce9ccc817e5b79f38759031e3324441f3e91e6b7e2802d1a694574bb4ce9e8f441d88ccbbd9280b3a4456eadab7d5fec WHIRLPOOL 1d3ba61d03d17a707a65423e85f7f3a235a9d39fb26e4602b5cf663e097dc9e8618380d7a54db60705e6b38e9c0674330df57a6e243c7215411275a489ab8b42
 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.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.10.4.ebuild
new file mode 100644
index 00000000000..b52a8b573a9
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.10.4.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="5"
+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.16.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.16.ebuild
new file mode 100644
index 00000000000..2dfcecd0324
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.16.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="18"
+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
+}