version bump

(Portage version: 2.0.51.22-r2)

5 files changed, 29 insertions, 121 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 5a222bbe5c91..1d9869607d18 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.108 2005/07/25 11:50:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.109 2005/07/30 02:27:37 marineam Exp $
+
+*ck-sources-2.6.12_p4 (30 Jul 2005)
+
+  30 Jul 2005; Michael Marineau <marineam@gentoo.org>
+  -files/ck-sources-2.6.12.1.patch, -ck-sources-2.6.11_p10.ebuild,
+  +ck-sources-2.6.12_p4.ebuild:
+  Bump to ck4, closes bug 100486.
 
   25 Jul 2005; Markus Rothe <corsair@gentoo.org>
   ck-sources-2.6.12_p3-r1.ebuild:
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 94473f72ea93..c2a4486b6ffc 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,7 +1,6 @@
+MD5 1276a0601d64ddfac543b89d018f79a8 ck-sources-2.6.12_p4.ebuild 1647
 MD5 4191e3a0c839e4243ec2eb1e3ac74ae7 ChangeLog 24438
-MD5 5d69e1de26377a9e0a4211e2c24ba046 ck-sources-2.6.11_p10.ebuild 1970
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 f43a24f403782cc93bfca447107c0022 ck-sources-2.6.12_p3-r1.ebuild 1641
-MD5 aa6fb935ccbfcc340803cd35e046cee2 files/ck-sources-2.6.12.1.patch 3500
-MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
 MD5 7626a3114d307c0453628dd62a8a87f8 files/digest-ck-sources-2.6.12_p3-r1 279
+MD5 c302bdbf2a41cf9ede7fd86ba69485f9 files/digest-ck-sources-2.6.12_p4 279
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.11_p10.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild
index f321f9e3d949..50d9712c4938 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.11_p10.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild
@@ -1,12 +1,12 @@
 # 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.11_p10.ebuild,v 1.1 2005/06/13 02:07:56 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p4.ebuild,v 1.1 2005/07/30 02:27:37 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
-
-#K_NOSETEXTRAVERSION="no"
 K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="10"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -18,6 +18,7 @@ MY_PR=${MY_PR/-r0/}
 EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
 KV_FULL=${OKV}${EXTRAVERSION}
 KV_CK=${KV_FULL/-r*/}
+detect_version
 
 IUSE="ck-server"
 if use ck-server; then
@@ -26,34 +27,24 @@ else
 	CK_PATCH="patch-${KV_CK}.bz2"
 fi
 
-#version of gentoo patchset
-GPV="11-14"
-GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
-
-UNIPATCH_LIST="
-	${DISTDIR}/${CK_PATCH}
-	${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}.${GPV}.base.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/${CK_PATCH}"
+#UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
+#	1900_pci-driver-typo.patch
+#	2100_e1000-spinlock.patch
+#	2300_qla2xxx-initialization.patch
+#	10" #All of the 2.6.x.y patches (in ck or manual edit) start with 10
 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"
+	1001
+	1002
+	1003"
 
 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}
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
 	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"
-
-# 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
-#}
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 pkg_postinst() {
 	postinst_sources
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch
deleted file mode 100644
index a4860aa86f4a..000000000000
--- a/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
---- a/arch/ia64/kernel/ptrace.c
-+++ b/arch/ia64/kernel/ptrace.c
-@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child,
- 				*data = (pt->cr_ipsr & IPSR_MASK);
- 			return 0;
- 
-+		      case PT_AR_RSC:
-+			if (write_access)
-+				pt->ar_rsc = *data | (3 << 2); /* force PL3 */
-+			else
-+				*data = pt->ar_rsc;
-+			return 0;
-+
- 		      case PT_AR_RNAT:
- 			urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
- 			rnat_addr = (long) ia64_rse_rnat_addr((long *)
-@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child,
- 		      case PT_AR_BSPSTORE:
- 			ptr = pt_reg_addr(pt, ar_bspstore);
- 			break;
--		      case PT_AR_RSC:
--			ptr = pt_reg_addr(pt, ar_rsc);
--			break;
- 		      case PT_AR_UNAT:
- 			ptr = pt_reg_addr(pt, ar_unat);
- 			break;
-@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *chil
- static long
- ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
- {
--	unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
-+	unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
- 	struct unw_frame_info info;
- 	struct switch_stack *sw;
- 	struct ia64_fpreg fpval;
-@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *chil
- 	/* app regs */
- 
- 	retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
--	retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
-+	retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
- 	retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
- 	retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
- 	retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
-@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *chil
- 	retval |= __get_user(nat_bits, &ppr->nat);
- 
- 	retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
-+	retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
- 	retval |= access_uarea(child, PT_AR_EC, &ec, 1);
- 	retval |= access_uarea(child, PT_AR_LC, &lc, 1);
- 	retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
-diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
---- a/arch/ia64/kernel/signal.c
-+++ b/arch/ia64/kernel/signal.c
-@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *u
- static long
- restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
- {
--	unsigned long ip, flags, nat, um, cfm;
-+	unsigned long ip, flags, nat, um, cfm, rsc;
- 	long err;
- 
- 	/* Always make any pending restarted system calls return -EINTR */
-@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __
- 	err |= __get_user(ip, &sc->sc_ip);			/* instruction pointer */
- 	err |= __get_user(cfm, &sc->sc_cfm);
- 	err |= __get_user(um, &sc->sc_um);			/* user mask */
--	err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
-+	err |= __get_user(rsc, &sc->sc_ar_rsc);
- 	err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
- 	err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
- 	err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
-@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __
- 	err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8);	/* r15 */
- 
- 	scr->pt.cr_ifs = cfm | (1UL << 63);
-+	scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
- 
- 	/* establish new instruction pointer: */
- 	scr->pt.cr_iip = ip & ~0x3UL;
-diff --git a/fs/exec.c b/fs/exec.c
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -649,6 +649,7 @@ static inline int de_thread(struct task_
- 	}
- 	sig->group_exit_task = NULL;
- 	sig->notify_count = 0;
-+	sig->real_timer.data = (unsigned long)current;
- 	spin_unlock_irq(lock);
- 
- 	/*
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4
new file mode 100644
index 000000000000..c6353d3b8126
--- /dev/null
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p4
@@ -0,0 +1,4 @@
+MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 f63017b130a37704894b14f8cf7695ad genpatches-2.6.12-10.base.tar.bz2 29871
+MD5 49dd492ef86080655d03b4bf4a00dfa8 patch-2.6.12-ck4-server.bz2 49831
+MD5 acfab10749980226fe222c70679c238c patch-2.6.12-ck4.bz2 49981