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

["Alice Ferrazzi" <alicef@gentoo.org>]

commit:     949d8ef285a111a956b9f3243aaef005031c61cb
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 18 09:14:10 2017 +0000
Commit:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 15:13:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949d8ef2

sys-kernel/ck-sources: v.bump (4.9.33 & 4.11.6)

Package-Manager: Portage-2.3.5, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4955

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

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 7d00c6b97d5..1f7e2c1117c 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -21,6 +21,9 @@ DIST genpatches-4.11-6.extras.tar.xz 17356 SHA256 5917d197fbd1aacd0fa365dc576a05
 DIST genpatches-4.11-7.base.tar.xz 196928 SHA256 4e58588c0250d2cbbf6f00d0c3534ce526dad3b53e329214bbe3689fe54f7e4d SHA512 61256201d7e04b2045439a431f6cbb36962d14b299b7412e37f69ebb5c321e82ae39babeb1ee62faba7aeb35b67af891826a1b7dc6a6c63b506f88016744d601 WHIRLPOOL eccc9a93d07b0c420fe958eec50ca9dc3e68ee0960fb1c60c96a389f4ec7c7690d46a88f04b1b18476d620597beffc364f0ca4f92c32b5ee32a63a03e1c2a625
 DIST genpatches-4.11-7.experimental.tar.xz 106552 SHA256 6ef901a55d88b36caaba4540e93c92ccc73dd097faf350abc2c247d148b00263 SHA512 6056ae9269288a76c56b93a85bae1a5cf68dd4d880aa11849af9c1da02a486e2d77f1ad491b5e66cae8122ea2d5e069363e98b6399c42ef55d33d81513268b2b WHIRLPOOL ca9f71baac03b3a07c4f97d86d15fd34820c3404407c02a369a1a5c05c5f70844a4fdb1f5378d8adf584c317dcbda4ba5e0d07986a665f0d2a610a59a0ffc82c
 DIST genpatches-4.11-7.extras.tar.xz 17360 SHA256 ce281a78992568afc67c8cef12ce80c0a8b76d2242e1ad02a35f4f670437685c SHA512 88ba3410a376112828ca7ba3b373020de252c79b3cd40f7a3d06cb316f1a3acada47a6d588827d9d48ba4f6bdbd8e18b0c4bf5587e55412fed86d90492920c30 WHIRLPOOL ff1356be12086974e8e437e23c377f721d81070be5debba6042b44469c04520910640de67ee8c260ab57d7c98e3cfd9944ab78b995d76889abfb3080ff48d945
+DIST genpatches-4.11-8.base.tar.xz 201408 SHA256 5cf255d4cad81d70345b6a21a8d92d1510bc0653cfe93d15f48acbe6d0f0ebaa SHA512 5caecea78f44b55289229ce38955015865dc06e09799ce9b2ce84ae9386d3d0797e973fdf6a7da03355db748dc7dd27b49d18eb37c2c3b857abe07ae366c354a WHIRLPOOL d84c78b05086fd4ea48ba87a0abb74b82eebe035f3ba1878244b4acfd8e0ad3c93d4e29fa001738ddcdbc54a96de0cd7d99eb027b1779a7e870427cab4448cff
+DIST genpatches-4.11-8.experimental.tar.xz 106556 SHA256 9450673572ae6b0645bf7771a786024dc5e803bb5ebe0d8e7f57fd1c5e90b954 SHA512 54e306a60f0efc2cd885bdddac4004ee6bdbae4b56bf18ba9b164f8cf5e85ef223340962bc73912e2c8cdd76bbdf1f278dfe6f8fef695819b7ed6ddd9a5b2648 WHIRLPOOL 1e0f188af0b4b7a9147cc9779ee34674dc8bb4d0dca14891ef7827c95b7d32f3271b788b6cc63d5c9a497a2dca20ffff155054816fb92c67d345dc6ce4721b58
+DIST genpatches-4.11-8.extras.tar.xz 17352 SHA256 b3e0339269dc41fbf08c0c602951442c8dbd4b887a6532fe904ee49108f947b1 SHA512 aef25f7897538b0a4c47545dc40254e415d950cde15165ce7de423adb12a3ebcf5f6a92a9d8113ada15e069be73f1f9e7e306bf5908d40c0a20c5001f8707144 WHIRLPOOL f82e1127748e6dcd1793592f39183f9ebedd08199767b0e6f4777ddee9d2874689f4db4ec51032e4193b9f2141f2ad5f6e5a1523bb1057c69edcf07d56206f70
 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
@@ -39,6 +42,9 @@ DIST genpatches-4.9-32.extras.tar.xz 17348 SHA256 0c25f8f637ac315d78020d83ef3c2c
 DIST genpatches-4.9-33.base.tar.xz 731388 SHA256 7dbdae23943a4a0406e5bd7946f593e263721eb826db659fda26c4e35afdfeb1 SHA512 c5f4c5dd16508f48e83d1f8bea6a7d9ec797586d5bee1ffed7859dc92f37b1e972205a1c95af882ac67a3e234cadff9a24e299dfc27a597e483e7143ece3d0a2 WHIRLPOOL effd1c2fed922f9748af2ee13990f0693f30df8dcf29ed1f856a31087a41aa1b4d0b2b6ffa191ae786cc020df16ae7c1418a26fe76f64ccb3b9be97de0814a62
 DIST genpatches-4.9-33.experimental.tar.xz 106404 SHA256 61a72e640b50cbbdf69403373ad59dc046903c3803e5102885128fd911eb169c SHA512 2589b8de664eed80b0738941d88cafb52480bb321cc27d66219db73f044d95e44cf0387a62748347098b77ac49cbc6af12e2ef0b4d3e294be7c9adbf16cd5492 WHIRLPOOL 8257b852e064c83b4189243495cf776359aecab050d76937b0d5550b104a9b066ad7707d98cbe95e2ddc23bd632a9fc028e0df57ba09f8e7668f2d2ac59fda24
 DIST genpatches-4.9-33.extras.tar.xz 17360 SHA256 ce281a78992568afc67c8cef12ce80c0a8b76d2242e1ad02a35f4f670437685c SHA512 88ba3410a376112828ca7ba3b373020de252c79b3cd40f7a3d06cb316f1a3acada47a6d588827d9d48ba4f6bdbd8e18b0c4bf5587e55412fed86d90492920c30 WHIRLPOOL ff1356be12086974e8e437e23c377f721d81070be5debba6042b44469c04520910640de67ee8c260ab57d7c98e3cfd9944ab78b995d76889abfb3080ff48d945
+DIST genpatches-4.9-34.base.tar.xz 767768 SHA256 10ea926b9bd98ba6185ddd4c4eea5407a39f3eda1d8ae94e63559b0db2f7f5ec SHA512 e5dabcf6f28ca9df91ee12bf3a98a75cc219622e386b31d414d685b853de06cbd243d4bb114f079024e370050f23b47d2018845f3ff223ead3648ffacad227ef WHIRLPOOL 1538614ea77c934fe7b9cc126adc31f12054fdbe87d62f801fa4a348b393e98ab85f56c4acd27edc8584b0067bacdb8b0f1180c9675a8daa3a9b02ada5860e24
+DIST genpatches-4.9-34.experimental.tar.xz 106412 SHA256 57d8d91b926cabd586c7e0f252663d5eca1fa450e6decc9da1676ce4c5ff7850 SHA512 5066a6dfcaf606898faf12c87a59e4b32a45889eb2194c2def0b3a3daeb7e780ae42064307075d56a7175566e8a467bddc3aad8785c0d4ebd488f143fca70b67 WHIRLPOOL 5c25659b9dfbcef9215a18c22f30e3ff7a1b0e82228364dc5c109948593d4637d955feb00c3141969ae7a81df9b281c7422a3d765322fa35b3c685f758a26bcd
+DIST genpatches-4.9-34.extras.tar.xz 17352 SHA256 8bf0e588ebc9f5b7ed63f7cf1de2708d46bb8fc9bee08deffa5116f0603a17e0 SHA512 f90a20a615d8cbb75a55f1fc2776a7738606139988297aa448d7066a03cad4ef6c541cbe668ea262befa540149a5a54abd8d51aab38df6482d903f7fadc6de2b WHIRLPOOL 3391dad625e2cf48debea2551e671ca9379ca24f570eeb7832b13fe073448127380dd8ddfe57da399d6bb18bd544b473137a2249e138bf10aa3a670c871194fb
 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.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.11.6.ebuild
new file mode 100644
index 00000000000..3b600ac88e3
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.11.6.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="8"
+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.33.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.33.ebuild
new file mode 100644
index 00000000000..c98739f1ce2
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.33.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="34"
+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
+}