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

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

commit:     9858151fa5f582bda251edee4adb7a8ca0dc1bde
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 25 15:45:33 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 18:14:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9858151f

sys-kernel/ck-sources: v.bump (4.9.39 & 4.11.12)

Future updates & support status for sys-kernel/ck-sources:

4.9.x (longterm branch) will continue to have updates.
4.11.x is at final release (EOL from kernel.org)
4.12.x still unavailable upstream (ck-patches not yet released)

References:

https://www.kernel.org/category/releases.html
http://ck-hack.blogspot.com/2017/07/electric-distraction.html

Package-Manager: Portage-2.3.6, Repoman-2.3.1

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

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index d6cdc747e6d..912abbc225e 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -9,12 +9,18 @@ DIST genpatches-4.11-12.extras.tar.xz 17344 SHA256 a8e11e00e3c635333efc943a65280
 DIST genpatches-4.11-13.base.tar.xz 287016 SHA256 de01a674596970f51046a7d622b4775c77cbde61eb746052808988df7018f07c SHA512 500e3c2089573d623861e92f4f6fc51524358b644f868d16d0bb1ae740ddbe2ab90f5f3096d4197853307819b132e8f0e267a0ae4ae9c396f7d5013417b14d69 WHIRLPOOL 3744e997679b330c87ec0b262b2efe473919931657e0ae93ee0172803c93ec1bbb80f5c1b24fbc155424494a1d7adeaf198595fbde3f9144a89426e44a2a8a13
 DIST genpatches-4.11-13.experimental.tar.xz 106540 SHA256 dedeb349143d95f3ec2ad6c67f1649520a1787f5eb14cb885986bea20d1a5734 SHA512 4aa5bfd891fecfeb5471485afca6f4eaa69cccb4a0c885395194c9eb2b77eadbecad32875145e153da2177e1c8ab2f1f5b6d6ea7365de8f2a790b7ef041893df WHIRLPOOL 6966233afdf6652a436336885cd79c23ad62b501ad56c85863c05284348d6cf516c0d20dc375c31fdeb89ce0bc3c3354c88b684de68ab0146eb245a9d0a52f68
 DIST genpatches-4.11-13.extras.tar.xz 17356 SHA256 938a52c1ad10c6ad4d8d18394ba0b09433cc978517ec82e52645e062f14474c1 SHA512 44d2014bb13262384aa571bff444e69d478c01c353b06de6934d6dcabed1da2f19b718af63ff5ad3bef765d19df1f99b6b836b69a41bdd8e9b43eb718ce9e1e6 WHIRLPOOL fcc4852398a6e5c7b89f435f8591f1cd3de74599de485135a80a82305fa53caa8cb4cd5dc5a0a8f47ccaf1f857887dd36237ad7d284e0bd270dfd53a06711103
+DIST genpatches-4.11-14.base.tar.xz 309928 SHA256 4d98138d52cf49f2fea90ee2b597b59a42686a20a2f99639c773dde44e3be877 SHA512 bdb3fa75a5eed5ef86bb20bf0a56b49616bfa2698577af6b62e6f1257e111b30e57504eafb411f998a9d2254f91a81685f0cc01aa724166720c3f4e4e3a8fda3 WHIRLPOOL b49cce46cf60108ac7ee07fa793123762e74d280351801cdb40916331bb63f5f124a7245a6416be35953dd9a0570a4db7faff36c21fdec16113bbfad01631af3
+DIST genpatches-4.11-14.experimental.tar.xz 106588 SHA256 d9edc8d0b2b2d5f060a08e368449707e2708e217eec2963b64a5722113e9a58e SHA512 58c06789d72378a6f72f279a7f98e75f8eff75df1647375435455f788434ade1821ff9467a52a2aeb8ce6f59de4d4a7b812c530a5aaec8f1b81da1c6c72ca807 WHIRLPOOL 20d26eafbc5e03c5b9a5590154d09c1f4c811a54fb518026c470ede966e5e033d44576c14fe29c19d869da4759cbeb9d8a4ced2bba5a0ea3df8c4b9462c77d5b
+DIST genpatches-4.11-14.extras.tar.xz 17360 SHA256 b9b6164eff5dbe458ee05f856770f545a28764d17d2216afd16940513053e16f SHA512 968906db8bb837f79478d8912220b4691de8231b06bf479b224a60b001831d1ea3824b4a47ae66894a3b7c2aefffbf0523570888ebe7e81f7c321c184e51a611 WHIRLPOOL d4ebfdd022a6ffa74a1a3f6f4d93366156c43ab9c3f9ba4d2d4b5395fba0a6cfb5800c9d9b2333de90d965eb66117e226647330213a566d3960e6d071b7c7acb
 DIST genpatches-4.9-38.base.tar.xz 850108 SHA256 42f5ed24f5a4d721a311f5d87f98bcfcf28305f1788ef107317f50f4124fe5cd SHA512 11e9128db46628fe779d24278553818b6ae7f47bc0441f07f52ecd7ff70ba5fd883770ccf2f37a53c99d0cc6390331e54b2bfeca695f2d81e21938c2d29aed08 WHIRLPOOL 1f4ae81279dcc3556760e930ba0fd33ce8b6737196ceaa696f17900bca0b1d5bdbac3327f944c7ac84eae4e6fbcdc59c278ee6e6b7eba04560ae4d4c3c0d1ad3
 DIST genpatches-4.9-38.experimental.tar.xz 106396 SHA256 d51d2ee8bb8cad9f4cdacac26f324b773000cdd4fdf1af6ec7fc1e4547218ca2 SHA512 4bbd5d1fbc379f2b0c37bdc3c5046981133e8c6ea2643269908c54e4251e0dd0f8d7a10dff90fda400bd800cf36cbebee42cc0b42f934e4e2593bb2821946383 WHIRLPOOL b82fb1cb2334dabeeb11e06db93e92a22c0b5bea260bbae89dcd0539312fa31e4e91f5add0c7d4ffeb51fcafee0021418f84a0269f85fe52ff8763598fda43ea
 DIST genpatches-4.9-38.extras.tar.xz 17344 SHA256 a8e11e00e3c635333efc943a65280e48aef3cc6b97bbeba1c99f1bad550e12c4 SHA512 8b5beba256adce91d3c0de7f0baec2e4fdf470f96e976a34729d1aaf59137d1ee5f4a1a5673bed0411fa31f4b2fa427a7c71cf0bd1a222a6c50ae008a09220e7 WHIRLPOOL 4a2670ccf3a13c1948ed36a6c49601477ff18bc7d6beedcbca3c12fd04542e3b9dd51b2926556bbc4adaf7413f5eecb63d8220982eae037dae7937c666d46600
 DIST genpatches-4.9-39.base.tar.xz 855704 SHA256 9cd1d1556de30b420f5d716d1b1554c0eee6e0cdb0982861f05d0dbe43868f6d SHA512 3be07220e6f3dd3015c783febcb5becf3a9eda02eec9447f57e52cfffb7c7905e84841fda048983f190125f1acdec32dc154e081a60766dfaec5ba7856173e70 WHIRLPOOL 2a59ce47f8cc691f78a96725753cf452aa2ce89b838fe9c8e86e4749f08f7e1e766d6ff84e2b468e23e6f8458b19c3115352f7811179162148b9e220fb54ea6e
 DIST genpatches-4.9-39.experimental.tar.xz 106360 SHA256 5bce6ae310fdebf5f0eb51aca9e7af39ea6f60906ffb567a91f3af3d98ea8998 SHA512 2d6dc7361b480b8b4a66de60aacd28b19c4a8131abc646763eb92c232e1e04ee4dafa6ab5634718abaa5722dabb9b928b0a1c792a40c63b4170f39f2ecb57400 WHIRLPOOL 88fdf58008eae0f28ba749872a3f4fc82e9aa279751df172975d7081d3b71ccbdef9bba0439868cba327b4cce4c3fc55566d3ebf66262d3166a4d407639716e9
 DIST genpatches-4.9-39.extras.tar.xz 17356 SHA256 938a52c1ad10c6ad4d8d18394ba0b09433cc978517ec82e52645e062f14474c1 SHA512 44d2014bb13262384aa571bff444e69d478c01c353b06de6934d6dcabed1da2f19b718af63ff5ad3bef765d19df1f99b6b836b69a41bdd8e9b43eb718ce9e1e6 WHIRLPOOL fcc4852398a6e5c7b89f435f8591f1cd3de74599de485135a80a82305fa53caa8cb4cd5dc5a0a8f47ccaf1f857887dd36237ad7d284e0bd270dfd53a06711103
+DIST genpatches-4.9-40.base.tar.xz 873248 SHA256 bff6bf6340301b0afee5b0fc1b74c40ac56b8c0c8a6dd491f47520bd3f7a4778 SHA512 d7f62112978aa40a5e34d62ed1843b666f101b65e5c0c5f7fb0273a942a3174767b8ada6b2d26942b67f822a4f56b12e87493037712eebe433e9769ee12f3e52 WHIRLPOOL ef094fe40bc703f7ad9023ea5a51a33b9b65d7f4d22027b3ef88954006be165b8903b4f337c451487457960780cc1041a1b3b84dcb9befb270546188bd9b7c21
+DIST genpatches-4.9-40.experimental.tar.xz 106408 SHA256 df363fca6154b95b9ce7a80f59511a0d7b79cefa8d225cf4ce63ccd8aaed223c SHA512 10fd0e22f7e064cc367eca6cea8243ebb7da4b2d72aa5001f02a6fe17e4945591bd6575b1e85172140ee60007071845fba5244014f40294a0f092bb6571cacc3 WHIRLPOOL 35de6e7e38b77e151bc5faa4d10db51d9b10b37ea15c29fab2b1b5df2b758d96c21c1f32309ba521ca7dc5cdd4c18c3ad16854c0105c99ea4098f36a81e1964b
+DIST genpatches-4.9-40.extras.tar.xz 17360 SHA256 b9b6164eff5dbe458ee05f856770f545a28764d17d2216afd16940513053e16f SHA512 968906db8bb837f79478d8912220b4691de8231b06bf479b224a60b001831d1ea3824b4a47ae66894a3b7c2aefffbf0523570888ebe7e81f7c321c184e51a611 WHIRLPOOL d4ebfdd022a6ffa74a1a3f6f4d93366156c43ab9c3f9ba4d2d4b5395fba0a6cfb5800c9d9b2333de90d965eb66117e226647330213a566d3960e6d071b7c7acb
 DIST linux-4.11.tar.xz 95447768 SHA256 b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 WHIRLPOOL f577b7c5c209cb8dfef2f1d56d77314fbd53323743a34b900e2559ab0049b7c2d6262bda136dd3d005bc0527788106e0484e46558448a8720dac389a969e5886
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
 DIST patch-4.11-ck2.xz 151196 SHA256 1acde415a6a35d301beb65bc09bd20903f3a9c835c6c850f4c5a0ce0ab236bc1 SHA512 e2c5a13960399bff0b5358cc1e98ac0628926f55b38ba8169f75c72ca2fc4bd2ed186eb344596d8d09010a216e098c090568e1bda63f60394330fe201e09045f WHIRLPOOL 8dccc7ea81cbe47172e401d397ca39cdf61a7c50ded528f46746cde2719f6533d70392c72006f17d4eef11f6cf8b0f7167fd29e14d5d091d7f3ef4cef2c8c019

diff --git a/sys-kernel/ck-sources/ck-sources-4.11.12.ebuild b/sys-kernel/ck-sources/ck-sources-4.11.12.ebuild
new file mode 100644
index 00000000000..6ef947f4e31
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.11.12.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="14"
+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="2"
+
+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.39.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.39.ebuild
new file mode 100644
index 00000000000..01df2be5e99
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.39.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="40"
+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
+}