summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-12-03 18:51:39 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-12-03 18:51:39 +0000
commit5cd5c34711857c2e743ff2074b4fb11c44820768 (patch)
tree38796bb7767fcbffb783c4546733496359265851 /sys-kernel
parentEach version adds more symbols into the shared library which the bindings wil... (diff)
downloadgentoo-2-5cd5c34711857c2e743ff2074b4fb11c44820768.tar.gz
gentoo-2-5cd5c34711857c2e743ff2074b4fb11c44820768.tar.bz2
gentoo-2-5cd5c34711857c2e743ff2074b4fb11c44820768.zip
Version bumps to 3.11.10 and 3.12.2, where 3.12.2 comes with new USE flags experimental and hibernate where enabling both will cause the hibernate test patch from upstream to be used; dropped old. Fixes bug #492966, proxied commit for Eric F. GARIOUD.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/ck-sources/ChangeLog14
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.11.10.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.9.2.ebuild)14
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.12.2.ebuild (renamed from sys-kernel/ck-sources/ck-sources-3.9.7.ebuild)30
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.4.43.ebuild111
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.4.54.ebuild111
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.9.11.ebuild99
-rw-r--r--sys-kernel/ck-sources/metadata.xml1
7 files changed, 47 insertions, 333 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 7c8b52f18133..63ba69c0893c 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,18 @@
# 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.226 2013/11/22 16:31:08 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.227 2013/12/03 18:51:39 tomwij Exp $
+
+*ck-sources-3.11.10 (03 Dec 2013)
+*ck-sources-3.12.2 (03 Dec 2013)
+
+ 03 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +ck-sources-3.11.10.ebuild,
+ +ck-sources-3.12.2.ebuild, -ck-sources-3.4.43.ebuild,
+ -ck-sources-3.4.54.ebuild, -ck-sources-3.9.11.ebuild,
+ -ck-sources-3.9.2.ebuild, -ck-sources-3.9.7.ebuild, metadata.xml:
+ Version bumps to 3.11.10 and 3.12.2, where 3.12.2 comes with new USE flags
+ experimental and hibernate where enabling both will cause the hibernate test
+ patch from upstream to be used; dropped old. Fixes bug #492966, proxied commit
+ for Eric F. GARIOUD.
*ck-sources-3.12.1 (22 Nov 2013)
*ck-sources-3.11.9 (22 Nov 2013)
diff --git a/sys-kernel/ck-sources/ck-sources-3.9.2.ebuild b/sys-kernel/ck-sources/ck-sources-3.11.10.ebuild
index d5f17dc7b28a..2d8e64127c1d 100644
--- a/sys-kernel/ck-sources/ck-sources-3.9.2.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.11.10.ebuild
@@ -1,6 +1,6 @@
# 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.2.ebuild,v 1.1 2013/05/15 18:58:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.11.10.ebuild,v 1.1 2013/12/03 18:51:39 tomwij Exp $
EAPI="5"
ETYPE="sources"
@@ -10,8 +10,10 @@ IUSE="bfsonly"
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
http://users.on.net/~ckolivas/kernel/"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="14"
K_SECURITY_UNSUPPORTED="1"
K_DEBLOB_AVAILABLE="1"
@@ -31,7 +33,7 @@ XTRA_INCP_MAX=""
#--
CK_VERSION="1"
-BFS_VERSION="430"
+BFS_VERSION="441"
CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
@@ -82,6 +84,10 @@ 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 ---------------------------------
diff --git a/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild b/sys-kernel/ck-sources/ck-sources-3.12.2.ebuild
index 3259ca6deda6..4db422986ad5 100644
--- a/sys-kernel/ck-sources/ck-sources-3.9.7.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.12.2.ebuild
@@ -1,17 +1,19 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.12.2.ebuild,v 1.1 2013/12/03 18:51:39 tomwij Exp $
EAPI="5"
ETYPE="sources"
KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
+IUSE="bfsonly experimental hibernate"
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
http://users.on.net/~ckolivas/kernel/"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="12"
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="3"
K_SECURITY_UNSUPPORTED="1"
K_DEBLOB_AVAILABLE="1"
@@ -31,15 +33,17 @@ XTRA_INCP_MAX=""
#--
CK_VERSION="1"
-BFS_VERSION="430"
+BFS_VERSION="443"
CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+XPR_1_FILE="bfs${BFS_VERSION}-hibernate_test2.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}"
+XPR_1_URI="http://ck.kolivas.org/patches/bfs/3.0/${K_BRANCH_ID}/${XPR_1_FILE}"
#-- Build extra incremental patches list --------------------------------------
@@ -62,13 +66,15 @@ 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"
+POST_CK_FIX=""
#--
SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
!bfsonly? ( ${CK_URI} )
- bfsonly? ( ${BFS_URI} )"
+ bfsonly? ( ${BFS_URI} )
+ experimental? (
+ hibernate? ( ${XPR_1_URI} ) )"
UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
@@ -80,8 +86,18 @@ fi
UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+if use experimental ; then
+ if use hibernate ; then
+ UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE}"
+ fi
+fi
+
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 ---------------------------------
diff --git a/sys-kernel/ck-sources/ck-sources-3.4.43.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.43.ebuild
deleted file mode 100644
index a4bcabda8c10..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.4.43.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.4.43.ebuild,v 1.1 2013/05/06 10:33:13 hwoarang Exp $
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly experimental urwlocks"
-
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
- http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="25"
-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="3"
-BFS_VERSION="424"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
-XPR_2_FILE="urw-locks.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}"
-XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
-XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_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="${FILESDIR}/${PN}-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch"
-POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch ${FILESDIR}/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
- !bfsonly? ( ${CK_URI} )
- bfsonly? ( ${BFS_URI} )
- experimental? (
- urwlocks? ( ${XPR_1_URI} ${XPR_2_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}"
-
-if use experimental ; then
- if use urwlocks ; then
- UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
- fi
-fi
-
-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/ck-sources-3.4.54.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.54.ebuild
deleted file mode 100644
index 3ac8e22b8c53..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.4.54.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.4.54.ebuild,v 1.1 2013/07/23 15:46:47 tomwij Exp $
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly experimental urwlocks"
-
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
- http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="36"
-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="3"
-BFS_VERSION="424"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-XPR_1_FILE="bfs${BFS_VERSION}-grq_urwlocks.patch"
-XPR_2_FILE="urw-locks.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}"
-XPR_1_URI="${CK_LVER_URL}/patches/${XPR_1_FILE}"
-XPR_2_URI="${CK_LVER_URL}/patches/${XPR_2_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="${FILESDIR}/${PN}-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch"
-POST_CK_FIX="${FILESDIR}/${PN}-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch ${FILESDIR}/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
- !bfsonly? ( ${CK_URI} )
- bfsonly? ( ${BFS_URI} )
- experimental? (
- urwlocks? ( ${XPR_1_URI} ${XPR_2_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}"
-
-if use experimental ; then
- if use urwlocks ; then
- UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
- fi
-fi
-
-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/ck-sources-3.9.11.ebuild b/sys-kernel/ck-sources/ck-sources-3.9.11.ebuild
deleted file mode 100644
index 3b5535b13204..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.9.11.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.11.ebuild,v 1.1 2013/07/23 15:46:47 tomwij 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="16"
-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/metadata.xml b/sys-kernel/ck-sources/metadata.xml
index 376d9ed31808..4edcecd6c457 100644
--- a/sys-kernel/ck-sources/metadata.xml
+++ b/sys-kernel/ck-sources/metadata.xml
@@ -9,6 +9,7 @@
<use>
<flag name='bfsonly'>BFS by itslef vs The full ck patchset</flag>
<flag name='experimental'>Allow experimental code. Can break or degrade performances. (UNSUPPORTED)</flag>
+ <flag name='hibernate'>Affine tasks to CPU0 as CPUs go offline. (EXPERIMENTAL)</flag>
<flag name='urwlocks'>Use upgradable read/write locks in place of the grq spinlock. (EXPERIMENTAL)</flag>
<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
<flag name='kvm'>Enable boot on kvm</flag>