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

["Ben de Groot" <yngwin@gentoo.org>]

commit:     764b246de5f63bf9a6c73d2930b13b160b628ceb
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 15:25:38 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 15:25:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764b246d

sys-kernel/ck-sources: 4.1.5 version bump

Drop bfsonly useflag, as upstream did not roll a separate patch for
BFS-464. Includes genpatches-4.1-9 and 4.1-ck2 patches.

 sys-kernel/ck-sources/Manifest                |   4 +
 sys-kernel/ck-sources/ck-sources-4.1.5.ebuild | 106 ++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 1e3f451..4c23056 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -52,6 +52,9 @@ DIST genpatches-4.0-9.extras.tar.xz 16284 SHA256 18f2b5d62d0c9295ea28db9d589fef5
 DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 9106e15001e0c286ef929d5e4505507ccdefb0aecdd094b73d57d587070d3288 SHA512 da1e3ef03874ab0fd3af811d6b72e791117dd7490ecbd8698e24e98424175c0ad7228182976fdadbc62a3ef69bf721f82d99cc1760417c4ba3401844fe3c8db4 WHIRLPOOL d3d3623112f118f98db870f48bc3181d6f510fdb4d916a88a832065a2e0df99c1bc5e04db6f7dd09c505f0253b76037965bbaa27103263dd95a713d0428db5ba
 DIST genpatches-4.1-7.experimental.tar.xz 214944 SHA256 1812d9b5cfa6a974cf36bb44a14bec26d021b29d386ce3139b50b99e3175143f SHA512 9704ae5529610afa2d6e62a123cba0a1891a18229a97ad5214449f23cf870e70932acd3a2ce32c5a30bd2cf89a64a012b23ee2591b699120cbffba3cb1cb0509 WHIRLPOOL cad56926d233a7b75dc4e915c1256a10864d356b6124b272f9af7eb59ae77871fd0c58ee810fdaf8d86820fdef1c0670ff7a463142cd7daa9fe9586983fc3fb9
 DIST genpatches-4.1-7.extras.tar.xz 16180 SHA256 39569583e833ff338b8126a52ae46a9a9b335d701006abbca7ed239bb84e7129 SHA512 4a5be5d19474a4679f83135ddfbb9af4b2c2c2d614ae95911c641c4d6fea8de9e25ebc1f4eefc2d9b1976c46b880e8717a0ca6987c64d2ccff969af5d6a84387 WHIRLPOOL 4509fef31139f79d7609e31d37b29f636471ba471c6ab47d6d4fcdd661b9a20d13e292b57a668b40a885a3aad4e2f831a1c3861aafbc3c85dd47f235b0ed09a6
+DIST genpatches-4.1-9.base.tar.xz 177624 SHA256 ebb16ec588dfc98222f5a5298de76e693e9d24ac8905af4b1d022b13e3fb9734 SHA512 59de6e58d054ae5b9ed096d800b8ba8323f8595f505dcae235d88deb6dba5b063239c3d2f9e08092a0c70f14d029936066765b680c44286caa2ea4f10b640bae WHIRLPOOL 1dc51a7a931a0744f824fdab9a463de7cd08127da0bd3424900c2b61f6c78feec2ae83ae4ec9558ad5a74c21e3ddd6a7b7f69c0af3b5f183671e3570c681a0c7
+DIST genpatches-4.1-9.experimental.tar.xz 214932 SHA256 7b2c86323056d3de7e6ea8674598686fe2b00eddda94f3d7dbee1ddc957d3000 SHA512 383ca9a2a92907dda40e2a76cd79880e72cea95898857d8e1a75aece590432b695cc2ec588f8f50f682bc3c36e721d6de8e22a507b10fd55c0d10210fc820831 WHIRLPOOL 9c383f81e5122064d09d181b0feaf9235069ddac5c56c8b824ca712cf3340319b3e4a090c95b46fe4343be840b921a330c32dcc521831d728597e1c93911caa3
+DIST genpatches-4.1-9.extras.tar.xz 16180 SHA256 1d4028868b4b7b5903898bda53156b068bcd8e3b7821908dbeabc4780aa4dda0 SHA512 506a3f570018fc2b6392ceddec558e980dccf292c3e119a1c5bd823c740c594f77a3fa6adc181687c658e447a9e6ea75a3a8883139a1baa5d47ee19351267b0c WHIRLPOOL df0366a4a5aac3530acc042813b643f922f84761d6c1a1a7d33a6701f03f868d9b1ba1915fb544d445df2665027652582a03336fad35c029a18f7dbc463d93e9
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
@@ -68,4 +71,5 @@ DIST patch-3.19-ck1.xz 62632 SHA256 6d3043360485bbf3b8b6b780d62ff529074489e6a4d0
 DIST patch-3.4-ck3.bz2 58930 SHA256 97a05793e15836866f7eabeeb08abec06dccbc23cfdd521c7e2c6c5baee20601 SHA512 f72c88f0b3570e3aa0f9c36cae5d535282c2e5aa29b3c0ac9e13db492f9df310f1fedbbcff5ea68ec872ea53c7cd968cff8e60746ccbeebb87f48a8a8a8d0c78 WHIRLPOOL 351be52877128717a40cdadf5c13aaddd688994f4654c901d905233cf41d5f0daf4aa771bf62da52d3d0acd98fcfa49234efbd0f705f4f34becd7b1ea22ddeb3
 DIST patch-4.0-ck1.bz2 59968 SHA256 be3ca32d048428a0cbd476bfe467e0d46d1848b95d4d7b70ab57b522d19f6cd2 SHA512 97f392e0bed2e6622aed7eb344f0ed499bb58ee118e62e28b67080df6ef02c7b874596e70d7db970a2f58f9f94faa3406c8a29eb5f6871ddc8d290ecd6aaf0b5 WHIRLPOOL 0efdd12ff388fdbbdcf6aacd910b27651f0834b3e8533c9a460e726c090fbaf7e926f8636f754960b54821cafcfadc665a3ad53884549ba2fe8975d76123628e
 DIST patch-4.1-ck1.bz2 60192 SHA256 d383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a SHA512 0679eab9ac50714beff50bb4551bdd01d29f3287e4438a1d88ce74ce11286dfb1ec8d2c8f07d0dd765ed3171488b52320e976e50eeb47c8da9b18ad8d7b3a233 WHIRLPOOL 7ddeb29822eaeb6cddd4e4ebf60a5fbf2f925f994627948520fe8138ae6324c62669460e823a0dcd70a181914247b7ba72bb4ff1b01a61718f4c1deb4651559b
+DIST patch-4.1-ck2.bz2 59887 SHA256 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428 SHA512 356e144f858b6015415b2c3f781ca534e5f77b818302e404c3d3b35c088f4a4163356b67f98bfc95175bd52bd8b3e9a9a3e336cbcd8adf6c2d388700ce630d4d WHIRLPOOL 2d54fa390adefd51bab2a3253881617a76c0c808464f0d67590fa9fa52b2100987b910bedc8a6d292d1712be5369ae0b1ed492317faf36ffcb29a7a66fc3a431
 DIST urw-locks.patch 7451 SHA256 09c7faed0234aabb5af6dd156eb99f2a2855b4adfec3a0a2dd9e6b6ef47d4cdd SHA512 dc5dd6f36ec8de68ad723174728df28137dbbecf81b9aca07cdeaec2d6410f42e5b5b14cd1d7fafbad44c4ab0f420db9285b3df28b990a43bc3a05327ef92e4c WHIRLPOOL 625444ada085ae324a1032e9c4d1b88376df9cd05ca613571799e96645eb58217ffd93c47d33e4ce4f0cc15eb82b572a00aee6edca93a371cf39474f54dee242

diff --git a/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
new file mode 100644
index 0000000..b92f51d
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+#IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="9"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="2"
+#BFS_VERSION="464"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+#BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+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}"
+#BFS_URI="${CK_LVER_URL}/patches/${BFS_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}"
+#	!bfsonly? ( ${CK_URI} )
+#	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+#if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+#else
+#	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+#fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}