summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-11-17 19:05:40 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-11-17 19:05:40 +0000
commite5087a8d221e038c4ba3a5a7d69fa8d1f1b865fd (patch)
tree0b08647e5fdae1245ff0e11c36320c9df1f945fe /sys-kernel
parentVersion bump. (diff)
downloadgentoo-2-e5087a8d221e038c4ba3a5a7d69fa8d1f1b865fd.tar.gz
gentoo-2-e5087a8d221e038c4ba3a5a7d69fa8d1f1b865fd.tar.bz2
gentoo-2-e5087a8d221e038c4ba3a5a7d69fa8d1f1b865fd.zip
Version bump. Bug #443566. Drop maintainer. Thanks to Eric F. GARIOUD <eric-f.garioud@wanadoo.fr>
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/ck-sources/ChangeLog9
-rw-r--r--sys-kernel/ck-sources/ck-sources-3.4.18.ebuild101
-rw-r--r--sys-kernel/ck-sources/metadata.xml4
3 files changed, 109 insertions, 5 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 799e581bbf04..21311f25fc23 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-kernel/ck-sources
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.210 2012/10/29 20:51:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.211 2012/11/17 19:05:40 hwoarang Exp $
+
+*ck-sources-3.4.18 (17 Nov 2012)
+
+ 17 Nov 2012; Markos Chandras <hwoarang@gentoo.org> +ck-sources-3.4.18.ebuild,
+ metadata.xml:
+ Version bump. Bug #443566. Drop maintainer. Thanks to Eric F. GARIOUD
+ <eric-f.garioud@wanadoo.fr>
*ck-sources-3.6.2 (29 Oct 2012)
diff --git a/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild
new file mode 100644
index 000000000000..09ad13901ea3
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-3.4.18.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 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.18.ebuild,v 1.1 2012/11/17 19:05:40 hwoarang Exp $
+
+EAPI="3"
+ETYPE="sources"
+
+DESCRIPTION="Con Kolivas' high performance patchset + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+ http://users.on.net/~ckolivas/kernel/"
+
+KEYWORDS="~amd64 ~x86"
+
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="12"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2 versionator
+detect_version
+detect_arch
+
+BASE_VERSION="$(get_version_component_range 1-2)"
+CK_VERSION="3"
+BFS_VERSION="424"
+
+CK_FILE="patch-${BASE_VERSION}-ck${CK_VERSION}.bz2"
+BFS_FILE="3.4-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}/${BASE_VERSION}/${BASE_VERSION}-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}"
+
+LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+LX_INCP_1="patch-3.4.11-12.bz2"
+LX_INCP_2="patch-3.4.12-13.bz2"
+LX_INCP_3="patch-3.4.13-14.bz2"
+LX_INCP_4="patch-3.4.14-15.bz2"
+LX_INCP_5="patch-3.4.15-16.bz2"
+LX_INCP_6="patch-3.4.16-17.bz2"
+LX_INCP_7="patch-3.4.17-18.bz2"
+LX_INCP_URI="${LX_INCP_URL}/${LX_INCP_1} ${LX_INCP_URL}/${LX_INCP_2} ${LX_INCP_URL}/${LX_INCP_3} ${LX_INCP_URL}/${LX_INCP_4} ${LX_INCP_URL}/${LX_INCP_5} ${LX_INCP_URL}/${LX_INCP_6} ${LX_INCP_URL}/${LX_INCP_7}"
+LX_INCP_LIST="${DISTDIR}/${LX_INCP_1} ${DISTDIR}/${LX_INCP_2} ${DISTDIR}/${LX_INCP_3} ${DISTDIR}/${LX_INCP_4} ${DISTDIR}/${LX_INCP_5} ${DISTDIR}/${LX_INCP_6} ${DISTDIR}/${LX_INCP_7}"
+
+UNIPATCH_STRICTORDER="yes"
+
+IUSE="bfsonly deblob experimental urwlocks"
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI}
+ !bfsonly? ( ${CK_URI} )
+ bfsonly? ( ${BFS_URI} )
+ experimental? (
+ urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
+
+PRE_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PreCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P4.patch"
+POST_CK_FIX="${FILESDIR}/ck-sources-3.4-3.5-PostCK-Sched_Fix_Race_In_Task_Group-aCOSwt_P5.patch"
+
+if ! use bfsonly ; then
+ UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${POST_CK_FIX}"
+else
+ UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${BFS_FILE} ${POST_CK_FIX}"
+fi
+if use experimental ; then
+ if use urwlocks ; then
+ UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}"
+ fi
+fi
+
+src_unpack() {
+ kernel-2_src_unpack
+}
+
+src_prepare() {
+
+# Working around BUG 436424
+
+ if use experimental ; then
+ if use urwlocks ; then
+ mv "${S}/linux-3.5.2-bfs/include/linux/urwlock.h" "${S}/include/linux/urwlock.h"
+ fi
+ fi
+
+# Dummy definitions for calc_load functions
+
+ epatch "${FILESDIR}"/${PN}-3.4.9-calc_load_idle-aCOSwt_P3.patch
+
+# Comment out EXTRAVERSION added by CK patch:
+
+ sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
diff --git a/sys-kernel/ck-sources/metadata.xml b/sys-kernel/ck-sources/metadata.xml
index 86321d725487..2f8f884bd61c 100644
--- a/sys-kernel/ck-sources/metadata.xml
+++ b/sys-kernel/ck-sources/metadata.xml
@@ -3,10 +3,6 @@
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
- <email>nelchael@gentoo.org</email>
- <name>Krzysztof Pawlik</name>
- </maintainer>
- <maintainer>
<email>eric-f.garioud@wanadoo.fr</email>
<name>Eric F. GARIOUD</name>
</maintainer>