Version bump, wrt bug #472842, thanks to Eric F. GARIOUD <eric-f.garioud AT wanadoo.fr>

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 118 insertions, 1 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index f5941ca38f4a..534c4b598c2b 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.221 2013/06/09 23:12:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.222 2013/06/25 08:41:47 pinkbyte Exp $
+
+*ck-sources-3.9.7 (25 Jun 2013)
+
+  25 Jun 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +files/ck-sources-3.9-virt_cpu_accounting_gen-aCOSwt_P7.patch,
+  +ck-sources-3.9.7.ebuild:
+  Version bump, wrt bug #472842, thanks to Eric F. GARIOUD <eric-f.garioud AT
+  wanadoo.fr>
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild b/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild
new file mode 100644
index 000000000000..3259ca6deda6
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild,v 1.1 2013/06/25 08:41:47 pinkbyte Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="12"
+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="1"
+BFS_VERSION="430"
+
+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/3.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... (3.7)--------------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX="${FILESDIR}/${PN}-3.9-virt_cpu_accounting_gen-aCOSwt_P7.patch"
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_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"
+
+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
+}
diff --git a/sys-kernel/ck-sources/files/ck-sources-3.9-virt_cpu_accounting_gen-aCOSwt_P7.patch b/sys-kernel/ck-sources/files/ck-sources-3.9-virt_cpu_accounting_gen-aCOSwt_P7.patch
new file mode 100644
index 000000000000..fa7622c70497
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-3.9-virt_cpu_accounting_gen-aCOSwt_P7.patch
@@ -0,0 +1,10 @@
+--- init/Kconfig.000	2013-06-10 11:18:35.000000000 +0200
++++ init/Kconfig	2013-06-10 11:19:26.000000000 +0200
+@@ -342,6 +342,7 @@
+ config VIRT_CPU_ACCOUNTING_GEN
+ 	bool "Full dynticks CPU time accounting"
+ 	depends on HAVE_CONTEXT_TRACKING && 64BIT
++	depends on !SCHED_BFS
+ 	select VIRT_CPU_ACCOUNTING
+ 	select CONTEXT_TRACKING
+ 	help