2.6.12-ck2

(Portage version: 2.0.51.19)

4 files changed, 95 insertions, 11 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 702df98dab1d..d48d2da5ffc5 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.102 2005/06/13 02:07:56 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.103 2005/06/22 17:41:21 marineam Exp $
+
+*ck-sources-2.6.12_p2 (22 Jun 2005)
+
+  22 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  +ck-sources-2.6.12_p2.ebuild:
+  Bump to 2.6.12-ck2, also added the vesafb-tng and inotify patches from the
+  gentoo patchset. Closes bug #96748. Enjoy :-)
 
 *ck-sources-2.6.11_p10 (13 Jun 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 3a862696a5d0..8e51aaf5d5b7 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d2138de43b0eb0057f43fe8e173bb9b1 ck-sources-2.6.12_p2.ebuild 2283
 MD5 5d69e1de26377a9e0a4211e2c24ba046 ck-sources-2.6.11_p10.ebuild 1970
 MD5 5acb8fb623a425ab127b480c5aa737da ChangeLog 23272
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrOqPnVkA0cTr1F4RAudrAJ9gUt3ZLpk59PzDKkJ7d8iVfAHNYQCfWgrU
-lu+zKb3a/xWZonsFB2qmTgw=
-=OIrz
------END PGP SIGNATURE-----
+MD5 c870982320df94050ffc39bba4279b69 files/digest-ck-sources-2.6.12_p2 357
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild
new file mode 100644
index 000000000000..96062f0256c1
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p2.ebuild,v 1.1 2005/06/22 17:41:21 marineam Exp $
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+
+K_NOUSENAME="yes"
+ETYPE="sources"
+inherit kernel-2 eutils
+detect_version
+
+# A few hacks to set ck version via _p instead of -r
+MY_P=${P/_p*/}
+MY_PR=${PR/r/-r}
+MY_PR=${MY_PR/-r0/}
+EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
+KV_FULL=${OKV}${EXTRAVERSION}
+KV_CK=${KV_FULL/-r*/}
+
+IUSE="ck-server"
+if use ck-server; then
+	CK_PATCH="patch-${KV_CK}-server.bz2"
+else
+	CK_PATCH="patch-${KV_CK}.bz2"
+fi
+
+#version of gentoo patchset
+GPV="12-1"
+GPV_VESAFB="4505_vesafb-tng-0.9-rc6-r2.patch"
+GPV_INOTIFY="4800_inotify-0.23-12.patch"
+GPV_BASE="genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
+GPV_EXTRA="genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.extras.tar.bz2"
+GPV_SRC="mirror://gentoo/${GPV_BASE} mirror://gentoo/${GPV_EXTRA}"
+
+UNIPATCH_LIST="
+	${DISTDIR}/${CK_PATCH}
+	${DISTDIR}/${GPV_BASE}"
+
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
+	10" #All of the 2.6.x.y patches (already in ck) start with 10
+
+UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}/0000_README"
+
+DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+SRC_URI="${KERNEL_URI} ${GPV_SRC}
+	ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2 )
+	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+
+KEYWORDS="~x86 ~amd64"
+
+src_unpack() {
+	kernel-2_src_unpack
+
+	cd ${WORKDIR}
+	unpack ${GPV_EXTRA}
+
+	cd ${S}
+	epatch ${WORKDIR}/${OKV}/${GPV_VESAFB}
+	epatch ${WORKDIR}/${OKV}/${GPV_INOTIFY}
+}
+
+# Left out for now because ck-sources isn't keyworded for sparc
+# (from gentoo-sources)
+#pkg_setup() {
+#	if use sparc; then
+#		# hme lockup hack on ultra1
+#		use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
+#	fi
+#}
+
+pkg_postinst() {
+	postinst_sources
+
+	einfo "The ck patchset is tuned for desktop usage."
+	einfo "To better tune the kernel for server applications add"
+	einfo "ck-server to your use flags and reemerge ck-sources"
+}
+
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
new file mode 100644
index 000000000000..385906e390c1
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
@@ -0,0 +1,5 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 b3614035f9892f8976ba9796138c40d6 genpatches-2.6.12-1.base.tar.bz2 15970
+MD5 38ec8ac0e1c9dcdb800d5e864b9fc447 genpatches-2.6.12-1.extras.tar.bz2 120119
+MD5 f0be9fd59e692f3c4c5fddecd9239b2b patch-2.6.12-ck2-server.bz2 39826
+MD5 cbc1df125bb7d57796a800242309a80f patch-2.6.12-ck2.bz2 39907