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

[Patrice Clement]

commit:     2ed64535131e1598e64456883e93ef9fca9635b3
Author:     kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Mon Feb 26 07:55:15 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 22:02:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed64535

sys-kernel/ck-sources: genpatches-4.9-87.

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7282

 sys-kernel/ck-sources/Manifest                 |  3 ++
 sys-kernel/ck-sources/ck-sources-4.9.84.ebuild | 65 ++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 2475f195cb6..88418548061 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -84,6 +84,9 @@ DIST genpatches-4.9-84.extras.tar.xz 17356 BLAKE2B 91a7c0e374e9ff9b18a1f290e4d01
 DIST genpatches-4.9-85.base.tar.xz 1570340 BLAKE2B fc4b5b181943a4492bcd47bead04b648d64465b6085f8785a72bcce937325428abebac6dc9329e3ca59c91fc4722cc856cb6fae29c4320a9b6eb86965c2dc2b2 SHA512 f5ee1f8f067558ac9ddf576b98103f1201a32a17ca48767dee66815ae0fadd5079d5fd33970e9d887f80c5349569cd6f96a18e666da361d69c59ccc3d53fb37d
 DIST genpatches-4.9-85.experimental.tar.xz 106388 BLAKE2B 826ba297b6c37887ec5223209a4567793678b1fdf6d2e433a6b350f27fe64710a3640185fcb8353a5f3adcbd2839f5553edd54a2d16427dc137be3f3c691e039 SHA512 b9eef13a61a249552fdac9a3a78493d0357536c4ba0f1e021f250633f335478a732702f3718224288ba957763b7d89482b86005ee33ae53732dc5d2a4515695f
 DIST genpatches-4.9-85.extras.tar.xz 17356 BLAKE2B a4b6b8b342f2695d0014e212141171bd58fb41721dac450ff2ad8cbef4ef4e9a322d50bd3da87fab7b277b96cdbcf6b592d548cbb948ead3bde041e465b957c9 SHA512 5907330084d47fbea3df39e60463efba8995757a5ce3b952e9606fac82d93c3aedf9806277e6f5b9ff8dd1c21ba1ad5e4de53bed786bc05e6616daddba1c66e2
+DIST genpatches-4.9-87.base.tar.xz 1625392 BLAKE2B fde376e07c13041e750e8a735c1ef53c037e24754f6d9ee51dcd03c6d6933f2cc42fd884be374d457ba6b1a4ff23208ae7f7c47e63df6528f473c0096ecc5808 SHA512 81f3151b7c34b49a0ce706f67006a68fd1b072592b684adcf79c612c8f3733109bf551e048024c0ada5400b143f99b8f65ec46a0299cdad34337f29b2038e511
+DIST genpatches-4.9-87.experimental.tar.xz 106440 BLAKE2B 287fbe6a213f9685769ebf6468b932c0cf2532acb17cd71abd5a89e0692e717adb58852bd5fe1123db839702a3329647e995b4adfd453843cda8f5f2ee761442 SHA512 944ef5dc4b13340935a0ec7e0e10ed4bf5fb5b399e7ba23b15a5dd552376750020dfec16cad05f38c4af66ae27d67212773a4220deecd883133fd68a5e55d772
+DIST genpatches-4.9-87.extras.tar.xz 17352 BLAKE2B 671b4dd2905585f9a05120520db4aafb71bc5f05ce4baf9714f444236efd7206af0bebfa70e59d5f4fdf11846b315d7184e2c1ae4e8aec9d4fa569ab720ced52 SHA512 96547f3df68212058559b1c59ba17a2ff0f51a0c7792c23d0b18e85bc1724024e1cb5bda3f5d6933da825d1fe7cad5371c6bb356ad53a587aa6cc66572576b8e
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a

diff --git a/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild
new file mode 100644
index 00000000000..387c01ad9f7
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.84.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="87"
+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}"
+
+# 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}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_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
+}