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

["Amy Liffey" <amynka@gentoo.org>]

commit:     c95d9fc73d7e0bee4656488702f0ed0daa1cf1ce
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Tue Mar 14 09:24:41 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 19:29:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95d9fc7

sys-kernel/ck-sources: v.bump (4.9.14 & 4.10.2)

Closes: #4200
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-kernel/ck-sources/Manifest                 |  6 ++
 sys-kernel/ck-sources/ck-sources-4.10.2.ebuild | 58 ++++++++++++++++
 sys-kernel/ck-sources/ck-sources-4.9.14.ebuild | 94 ++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 84795b18815..38995bdfdd1 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -9,12 +9,18 @@ DIST genpatches-4.10-1.extras.tar.xz 17328 SHA256 120d720363b78d18c198cee75e2fde
 DIST genpatches-4.10-2.base.tar.xz 11420 SHA256 21a3562b144e7e1ad80ef846b4793701d0acdd603ece5e9db0945066b2471720 SHA512 d0682416eac5e60308fa2c6da540beabe4f61e7144096e867b2b45f497b2465076ae14447c4c7e6378c4ba62d8811249c8906505604ca82cf6244a2fe880b00f WHIRLPOOL 50278fbea48138c65897213e9a6b75634245a1febeb39141822737a0a8169497645eb470520183df708c09f5f2d848c407d88fca0c655e0296cc25b5ff66be12
 DIST genpatches-4.10-2.experimental.tar.xz 4276 SHA256 4c96172e68278d2c364c68868925ffa2596d41f765a794acda7850ab73523ee6 SHA512 618f128e228e9d035af0b8b08d7c72600796579383834b8ef9a6ed18907bf704cc811d8dd9fda7e1b3590af4fbffdfe4f3e18aba82207cda17f0b8827a6f3375 WHIRLPOOL 05cf7b8eb6144a7fddb407d66f59b368c905cf2b75e15e846044a4c7edaf62b0506d365122ac17d23be36eb82ea7d06ea9c96dbb5449bfc8c9cda076ed347889
 DIST genpatches-4.10-2.extras.tar.xz 17328 SHA256 74092d499a5762fdc5334024b6cabb5ecf1bda47473baf0a930cb80f44ce4832 SHA512 a79a7339c0c8a1c8871b8ef93bc9089d7e3a54ff5c9f64afaa77d6a512a13b6f0ca6ce6b1b4b878c312e10651469414241c9b96cd267fa8031edf093d5de0012 WHIRLPOOL 4684b18aaceea92869ed266a3d8dad10adfd801efdda8eeebe7d711ec6561b8527e86762e86d3883d11bd92c7a313101ad1318b8953f5279ee775c3036f9dfba
+DIST genpatches-4.10-3.base.tar.xz 69616 SHA256 01c944e304c52b73e7c6a5f9edfd42ee7de157a06df87dba21411c556da4203e SHA512 705e752d85f62230da426eb0cb93aa14489cc3731041bd493973ed02b09d6470c1174395921e12561a7869de4f8f4c4ac5042db5b75c22c4f3ea2db39aec465e WHIRLPOOL 631f62536d63a00e97e1afd5225ff6e3aee3e31110bb4bca21e89a3dd90fb2681de2268375538efcfe9fcfed647436587b76f5dd34113c826afb66b5e25f3f9b
+DIST genpatches-4.10-3.experimental.tar.xz 4268 SHA256 70bc693665e5ec27fae327b04cdc50823eba722aedb12fa8bdc813ed1a0fd814 SHA512 268700775a5eb3708df5c733443ab822cf6e91bec3aeee721607233165bbb3e8d1a2ca0ecf0f3fc67047e79b32f0b18037cbb7d66bbd2fd66529d45455438d2c WHIRLPOOL 3fe392587aa8ab9dade60f0f9d6c62f175cc5e1a60ec23c23698d23c9b8599a4f394a70e4e5ebbb0627d3e7f423a2fb49085d2867e1ad94187b8cdf8eeb9ffb1
+DIST genpatches-4.10-3.extras.tar.xz 17344 SHA256 0d604227fd07cb97afe7ace9623d1f919f36ec2ea9d97fe8188fa29a54799e2e SHA512 fbf10241585ca9c176e87320eea175d37ce07d7a5c60830c538f81eb11f8e25e015037d8372809c14bb815da106e441bd6e1cc1347231d4b7da8745c679cecc5 WHIRLPOOL c6660b8cfe23532592a9999fb164f266d4cec12fdbeaa24b1a7b208d1643da11d6f59ec999e0e544b30551668634196b6429ccb640c94991b036f0de798a5502
 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
 DIST genpatches-4.9-15.base.tar.xz 306680 SHA256 0d21f36e5dada40a98ff345ebc01678d2aee060becc7c5c1df84edec9279af2a SHA512 2962f30bd055a5afcefe8aca654419da52c61fc8e5ee8a16770020f517467ad13e4d7ba47c0b1b531b0e4be630b4ca2cf78170544d5ac0115db7071cc504278b WHIRLPOOL 77f667264615abd7a7324abf60bcc2177421595130103d1af79a438da907fb2d274048f51e2f5ae66d80b27a8b1ba732c0653fa48d58bfff338c815cef3b68eb
 DIST genpatches-4.9-15.experimental.tar.xz 105620 SHA256 95e2425fe639048d06d9695c34cc4e74222e29b08fe1e5e4673e746d6f5ad8d4 SHA512 f708e6247ea3cfdcdcf2e4c80ddf65722ca078a10a545d21172d46ce0e9021e3f6cd382c85aa8bd219d1da1c69de6be21c41d8c2250ad0fda1e21e8ae2964577 WHIRLPOOL 8272693cd4e3a95bc731f035c0d2002761d8446f3fe21ae217c9ba83d127f4da4d0b072ca89fe8e7068540b4e55671f5acf288779dbff79542a590505802a64c
 DIST genpatches-4.9-15.extras.tar.xz 17328 SHA256 7d65754bb7e17d006462d0575a954c48d5ce98ad5ca370cb7f227ba7e711cda0 SHA512 4b4e61cb350716fe0e111ee81309de985e7a4442e7fce0268b50a8a02bddc63a904fd148dee8f1258c1df393324236cc75f823c4708f10a74863cdaf5c28d56e WHIRLPOOL 849be987dc4a07fc7161ae52e2c996ad6dc4c8395e1559f41df508b6b95b60df00a50a3a252adc17d003a0630a580869d36661bef1dfd3186e7977f5900aa445
+DIST genpatches-4.9-16.base.tar.xz 353628 SHA256 fd5b738f18fb098bfb1a278988a95c009880a53d99a052a8044068711c02feca SHA512 2c8852d00174edf3f593b52688a7322d7256c0ea74b57dac59b813c1c4f9d31c925a79a6ef439c59c9840499f733697038eb2eae71ba4d2af81e3736a203fe0c WHIRLPOOL cb4a94fb62fefd6bab049363b8fd909908ba2dfd7fa825c5cd499e9871223bdbe4b359a30b7b4b274844725f1fb45d9b08828a1efce8a7befeaca9a749c83b56
+DIST genpatches-4.9-16.experimental.tar.xz 105636 SHA256 9a754a9530fd771f9f3d6b130ba61426d4163dd22e083c8a5785575ea5ada61d SHA512 cd429b164d368afa94872766c3c317b14de2e06230ecd0b0d63f9c7e7601a54536f87f15f844c3a4b952493979f9035406518bcc65773e4a528fbd57b2c351c2 WHIRLPOOL 0cbbd44c7e104112ab599b0465f14d41a34b0a9351f2ec8fff9d4eab1cb81c19da51806d1daff161c2de205c2bf76233bbafb722ed24e014727e0358dafb4c57
+DIST genpatches-4.9-16.extras.tar.xz 17348 SHA256 303d08a22a2529392ec183515290f64f6164e714536c26eb2cc3d302102d3d4f SHA512 a4a5085a5ca6939e5918f183fc3c15a892cff28261e84931a6b4fbe736106c7b7dc653594fa42a17cc8ead67554a47bbbdb39cada5459053c5b87638bed7d87c WHIRLPOOL 722c79fad3b22bbcaa80dd3b7593f0120114a8f4d23749e3fdec98320af7f9cab491116c4e2043d4de72c085b9e5bf46c5a087d777f77af0f5055420dd5b61c8
 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.2.ebuild b/sys-kernel/ck-sources/ck-sources-4.10.2.ebuild
new file mode 100644
index 00000000000..ccb1a14ea31
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.10.2.ebuild
@@ -0,0 +1,58 @@
+# 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="3"
+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
+}

diff --git a/sys-kernel/ck-sources/ck-sources-4.9.14.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.14.ebuild
new file mode 100644
index 00000000000..3dd0ec88766
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.14.ebuild
@@ -0,0 +1,94 @@
+# 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="16"
+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
+}