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

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

commit:     dc3f3a76cd61f3dbd2c3a9a964c4e702cc678e7e
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Fri May 26 00:26:55 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Fri May 26 08:04:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3f3a76

sys-kernel/ck-sources: v.bump (4.9.30 & 4.11.3)

Package-Manager: Portage-2.3.5, Repoman-2.3.1

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

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 68d4ac76899..9f331203d96 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -12,6 +12,9 @@ DIST genpatches-4.11-2.extras.tar.xz 17344 SHA256 67335b74fcb7ac24389ed17cc586a7
 DIST genpatches-4.11-3.base.tar.xz 59724 SHA256 da783874402b0bf7b4e1d03825f69a803abf4d96573973a75d021485f8bcee30 SHA512 7afa7e6d2c64f8b04c22818bb324b6d4f77dedbd305a86932e707dea31f4c40b717e8c6de5f2f390cac166adbcc5cd70f09be2cada8fe97725858a56f2cd0985 WHIRLPOOL c9c61eb22eb3610da38c4e5966227743f4e25308003613d01b21a36f5b591f5bce325fe5d7ef30df940e8a15046af2d46d19e9b7dc4ff47d07ffd178ed750b98
 DIST genpatches-4.11-3.experimental.tar.xz 106660 SHA256 faab8e7f61e0cedb82cb16dd7c263d15bb0855cd6c2779aaedf80d5a5d2ef359 SHA512 cca29e98153070948fd88fb52500b81db3e47dda95c0cf730c31949dc29614321662eded4dfe1be0cb1df28399fab235e29a88c9f098107cef2271bdbbbaa588 WHIRLPOOL 2b7c443aed784b850d7ffcef613adbee5550e3443bfb97b735750a5bb595be5b80b457a80c6ace6e43ea61d2bc049449cf8748233d0a74d58c259f89464e5342
 DIST genpatches-4.11-3.extras.tar.xz 17356 SHA256 2b3449f4785ab494255e1c97ca2ca85ddcc32c6d4f30dd334a7c76c45bb3a666 SHA512 0b58f44117ec09932a8776332201a6902efdbc2ae8a23ba3c8e26b52ba3eb42b845f221cbdef7ccd31830964e8fa30cfcf0e91285c16b96c67047a367ebe8b25 WHIRLPOOL 54320d6d0abb9f9f08875c5c4dcebe725fa4980e0efc42d4b1b72629635a2dbc59a17cd553731ac056458eddeb4026993f5227f7eeb669fc311de4610807d88e
+DIST genpatches-4.11-5.base.tar.xz 116796 SHA256 04c22c62a78cf69eb56fba64056a1aa8cff5823f92490b0b88e1294340ff711b SHA512 ab264f6f31ed06f9c657af48ec4402c327ea9c920917032eab19ec78d915fe46fe1d9d46eaf891204e8e61974ff135c2de1d1a36cfb11d7760aa030641cde010 WHIRLPOOL 95dce90b089e20331b3837c428fe23d3a728427f54abaa6a66cda9147d407c95cf359ee1287eae070a6db64252a2c40a8613227fd16fb1364014beacafdcc3e7
+DIST genpatches-4.11-5.experimental.tar.xz 106560 SHA256 21f69bf8dd8b650a8263f4dbe4651caab5f161a68796fa712b48d7871e6621f4 SHA512 093d9cf7ef3de734ca98e5650637d785e4624dad91abaadc478f530571c3eef742d4a77f8dcd4071acd0e46d89dc0ecb2ffeddd34348cf172ce63a6d353ecf4a WHIRLPOOL cecbeab2078719098ea8fe88c07f980da6051419c631a686d21ebc2c8da3ed5bcb457a36f05fc453ebbed757fce687215388b8174bf1dddd4dec79aff6e73f82
+DIST genpatches-4.11-5.extras.tar.xz 17356 SHA256 1253db807bbf0ed52f5b2aed8e629e6c4ff0ae8ee08a1c7585576b6c71ccb939 SHA512 b61a4efb99a90ca9d177521b3d093d69f41d80b287b9307915e4c6f0c82d11ccd644755f1c28a9c97e54738c6cfced870e26d05d48b84c0c9ab6548949d618a0 WHIRLPOOL a74e7daef98d211f2fb8be2a2ef6bb2d2e493069d6bbdcb141a1e8eec6f7df7e4e57a71e538ea0c6a7e6ecc90ade79d78c22485e987361b43ba8ceb694c284f6
 DIST genpatches-4.9-28.base.tar.xz 581556 SHA256 a72e384dd4e3e835099bd430a89497e2d8ec9e1592262c887a705ad7f8c71160 SHA512 d6f04d54da3e57a8fa500063c215353d8a5d25122dcbca56443f35a13c833bc18fb499463df5c995818998df8b0b68167954a55682d7dbd44e5d2a97c5be5fe7 WHIRLPOOL dcdcfede3ec09b81277e337b4eca75e214395f73a8096ed103df88b0867c56774a3cc00637de0846e05f6a1835133be73012b57757b4ba5f92d569be9ad7948f
 DIST genpatches-4.9-28.experimental.tar.xz 106388 SHA256 cef686eb8c86e5f867d4c30d0203441da2138339e53b14de06cbef3673e460eb SHA512 8de1f97455be9519cd5320cfbf395cbf2f3be6a307d0b435f149da6c14d3461aabd04599fb122c013bac7ad0118f79c36bfaf7f6b71acf2d7323de25468dba04 WHIRLPOOL 82da257449bc0447244d05dfecf099eab7301b2c1cdadb1801b7e5a1ce00b06b1c63de5ed88c052cb944e2dc7579e50b20485220486e70c7a0c500ab2adaf224
 DIST genpatches-4.9-28.extras.tar.xz 17348 SHA256 9b8d40db773ce13feedd5ccb2ac7e88236d997c72d1adac7d0ba41fd2a432292 SHA512 5fa4001147c6a276a93896ea6d55f7ff24f4f0606b0cfbc2122d65dc685f9656b6146547000428b1940dc9cca434bd00880639b39bbd5e1f35331e2337842ab3 WHIRLPOOL 419bcba4c2e9fb26cceaede2bb70fbfeb41fdbb98ab1ccd49967a9e4daf1c75692f78ae35f70e8758031e94c7dfa52f27ad5a337c25a933df8aca36450a2fd83
@@ -21,6 +24,9 @@ DIST genpatches-4.9-29.extras.tar.xz 17344 SHA256 67335b74fcb7ac24389ed17cc586a7
 DIST genpatches-4.9-30.base.tar.xz 630160 SHA256 73bf63139326ee5dbd98624be96d051e1d4c40a683bded6a2112c072d520e556 SHA512 0efa914dff8520b7abc1d1173e46a97de749c799e2ec926be3700fa0110e4f1c9ad9c4a06db596e65987cbc9e49f0cd7f5bb0485c1a51cc7978ea863c14650e0 WHIRLPOOL cbc245f3891ee5a9e9eb9c11f3a1f4d69cc6c1e3a0435c7cef6e90a813271f32cae12886af1499bd12ed0b879f13896927cebfe85afa758e62a159d4e2b11b6b
 DIST genpatches-4.9-30.experimental.tar.xz 106372 SHA256 1469d88ddfffb8e64aff9dcf2124cfe2829d6b059e966f0eecd51b47b6e46b69 SHA512 ba4f30901df8401211f7012904954ce52e79d656a46c4b8be1a2059e7dcc77e16ca588dd6a17aa179e6407a33e43bc035188e5ba674389c098b9cabf384bc88e WHIRLPOOL 1a27b2121d684650f75df10398ed33a0d4545ffe8fab7e5e84a74554e8321d4a7af3d4e5e381362cc0aa33976c7bfdef09f470f0675c96e5fa4c00e9a67a9583
 DIST genpatches-4.9-30.extras.tar.xz 17356 SHA256 2b3449f4785ab494255e1c97ca2ca85ddcc32c6d4f30dd334a7c76c45bb3a666 SHA512 0b58f44117ec09932a8776332201a6902efdbc2ae8a23ba3c8e26b52ba3eb42b845f221cbdef7ccd31830964e8fa30cfcf0e91285c16b96c67047a367ebe8b25 WHIRLPOOL 54320d6d0abb9f9f08875c5c4dcebe725fa4980e0efc42d4b1b72629635a2dbc59a17cd553731ac056458eddeb4026993f5227f7eeb669fc311de4610807d88e
+DIST genpatches-4.9-31.base.tar.xz 671048 SHA256 678b5669505c3e3ccab876fe08bd9b7ddde05fb3e18098a490dd9e3151f6282a SHA512 8f682c48b24eb3839c69c001906be28f5ad0e8ae4512f3d080416d040b86b689e21338441af9aa601bf0e14979eafd933556a9bb7c36318bb14a7f29b0844904 WHIRLPOOL 98a16b8987b751eb173c908529c9e80149b048077b9cbec1a075d359f3f3a38f4cb0f67681ee977357fe627b80cf6b296b150f6187c71b873033505389603215
+DIST genpatches-4.9-31.experimental.tar.xz 106368 SHA256 f9f25811412ec2b5f0c4b9873b9a9bbbebecd3e720a97c85c8ea9e0906e064b1 SHA512 a4237937e5057cdeae443bf28bf0902e8e2d5c9a2b5767f3b538a3babcb13f7cf29895b42f34e4d4af892243945a59430bf0ffff48c1f06407fd1bab9009aeec WHIRLPOOL e27eb58ed55e855f4419a4100cb0256de41276268dc4d17362316c4286076096fea149088b6696b35ef4c96b52c732dedc03cfd09c9f35d99bc4f93914f4b025
+DIST genpatches-4.9-31.extras.tar.xz 17356 SHA256 1253db807bbf0ed52f5b2aed8e629e6c4ff0ae8ee08a1c7585576b6c71ccb939 SHA512 b61a4efb99a90ca9d177521b3d093d69f41d80b287b9307915e4c6f0c82d11ccd644755f1c28a9c97e54738c6cfced870e26d05d48b84c0c9ab6548949d618a0 WHIRLPOOL a74e7daef98d211f2fb8be2a2ef6bb2d2e493069d6bbdcb141a1e8eec6f7df7e4e57a71e538ea0c6a7e6ecc90ade79d78c22485e987361b43ba8ceb694c284f6
 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-ck1.xz 148444 SHA256 d5903ed77b33984720e2178d34f8db287f6c274b7f1a30b4f28306b71a0bc3f1 SHA512 ce99c7da1d42f08da149099d8f365414c1f4dbb1cc0464547cb17c42a20b4112281657ec69c47fc97859900aaf780edcf56f3779bd6e715f04376f606e137513 WHIRLPOOL 865ce1dfb09712760e09b2658a8048ed019a2902f5c72e0ba78ba3b48d520aea5aa091d27c6802afcbeac52cf4dcc62d15b5b4dc68872d064e59a90871637033

diff --git a/sys-kernel/ck-sources/ck-sources-4.11.3.ebuild b/sys-kernel/ck-sources/ck-sources-4.11.3.ebuild
new file mode 100644
index 00000000000..b52a8b573a9
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.11.3.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.30.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.30.ebuild
new file mode 100644
index 00000000000..7787c2cb20c
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.30.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="31"
+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
+}