Bump, and add a patch which fixes booting for me, but which AKPM doesn't like, I imagine next version will have a real fix

5 files changed, 117 insertions, 2 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 6add999fa692..06b30f00dda3 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.137 2004/03/24 16:18:32 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.138 2004/03/25 17:29:35 lostlogic Exp $
+
+*mm-sources-2.6.5_rc2-r3 (25 Mar 2004)
+
+  25 Mar 2004; Brandon Low <lostlogic@gentoo.org>
+  mm-sources-2.6.5_rc2-r3.ebuild, files/devfs-boot-hang-fix.patch:
+  Bump, and add a patch which fixes booting for me, but which AKPM doesn't like,
+  I imagine next version will have a real fix
 
 *mm-sources-2.6.5_rc2-r2 (24 Mar 2004)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 35df7577dda7..55a4c76f0e1a 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,10 +1,13 @@
 MD5 98cdeaf5d06b3bb2008a9eb6c3b5f284 mm-sources-2.6.5_rc2-r2.ebuild 1034
-MD5 905e482dbc4b0167ca68f9d8caee4f6d ChangeLog 23940
+MD5 677cede71abaf0446fae3a2d14d0ade7 ChangeLog 24225
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
+MD5 f8e0add757ed3d0b50ca7f1bcc442bee mm-sources-2.6.5_rc2-r3.ebuild 1072
 MD5 e8975009a099b493ca78eb7ba33843e0 mm-sources-2.6.5_rc1-r1.ebuild 1032
 MD5 469ebb3583d8bf6430cdbf0872a09097 files/2.6.4-r2-kbuild-fix.diff 599
 MD5 bd9f94e618531f7b76322e9ce9f0ba08 files/mm-sources-2.6.3-r4-symbol-fixes.diff 900
 MD5 5983a33847ac909774db51eac30dcfeb files/digest-mm-sources-2.6.5_rc1-r1 192
 MD5 b2b79501357921787373b0364e186401 files/digest-mm-sources-2.6.5_rc2-r2 194
+MD5 af57dceae578f11cdfa8f70933c46ae0 files/digest-mm-sources-2.6.5_rc2-r3 194
 MD5 a613978c67d87fc251c04d2a52dddcc2 files/2.6.4-r1-tty-fix.diff 575
 MD5 8f578df14b624397068e82c4f6c51232 files/2.6.4-r1-debug-spinlock-fix.diff 325
+MD5 d3e6aaa68beb4ad5f78b43e7c7b98e44 files/devfs-boot-hang-fix.patch 2399
diff --git a/sys-kernel/mm-sources/files/devfs-boot-hang-fix.patch b/sys-kernel/mm-sources/files/devfs-boot-hang-fix.patch
new file mode 100644
index 000000000000..b02fc44a53c6
--- /dev/null
+++ b/sys-kernel/mm-sources/files/devfs-boot-hang-fix.patch
@@ -0,0 +1,79 @@
+Eric Valette <eric.valette@free.fr> wrote:
+>
+> I have compiled a completely clean, unpatched (I mean except of course 
+>  rc2-mm2) and I can still not manage to finish booting. However, this 
+>  time, I get a little bit further AND system seems to hang exactly at the 
+>  same place each time (which was not the case with rc2-mm1). In fact I 
+>  managed to have the same behavior after removing the initramfs patches 
+>  from rc2-mm1 and fixing some other things using bk snapshots diffs (SCSI 
+>  st driver).
+> 
+>  It hangs when executing :
+>  /etc/init.d/console-screen.sh after displaying:
+> 
+>  Setting up general console font..
+> 
+>  Attached is a shell trace of a working session on
+>  2.6.5-rc1-mm2. It basically does (twice wonder why!) a loop of :
+> 
+> 
+>  /usr/bin/consolechars --tty=/dev/vc/[X] -f lat0-16
+> 
+>  I also traced the set of system calls /usr/bin/consolechars does via ptrace.
+> 
+>  Of course, the same shell script, same binaries and same settings works 
+>  for 2.6.5-rc1-mm2
+
+Are you using devfs?  If so, please try the below patch (I don't see why,
+but..)
+
+Can a sysrq-T or sysrq-P trace be generated when it has died?  You may need
+to alter your initscripts so they do not stick a zero in
+/proc/sys/kernel/sysrq.
+
+---
+
+ 25-akpm/drivers/char/vt.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletion(-)
+
+diff -puN drivers/char/vt.c~a drivers/char/vt.c
+--- 25/drivers/char/vt.c~a	2004-03-24 09:49:10.285591688 -0800
++++ 25-akpm/drivers/char/vt.c	2004-03-24 09:50:54.355770616 -0800
+@@ -2471,10 +2471,13 @@ static int con_open(struct tty_struct *t
+ 				tty->winsize.ws_row = video_num_lines;
+ 				tty->winsize.ws_col = video_num_columns;
+ 			}
++			release_console_sem();
+ 			vcs_make_devfs(tty);
++			goto out;
+ 		}
+ 	}
+ 	release_console_sem();
++out:
+ 	return ret;
+ }
+ 
+@@ -2484,11 +2487,13 @@ static void con_close(struct tty_struct 
+ 	if (tty && tty->count == 1) {
+ 		struct vt_struct *vt;
+ 
+-		vcs_remove_devfs(tty);
+ 		vt = tty->driver_data;
+ 		if (vt)
+ 			vc_cons[vt->vc_num].d->vc_tty = NULL;
+ 		tty->driver_data = 0;
++		release_console_sem();
++		vcs_remove_devfs(tty);
++		return;
+ 	}
+ 	release_console_sem();
+ }
+
+_
+
+
+-
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5_rc2-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5_rc2-r3
new file mode 100644
index 000000000000..7939fb63e490
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.5_rc2-r3
@@ -0,0 +1,3 @@
+MD5 f5d7cd3b43983acfea3ed05221da34e9 patch-2.6.5-rc2.bz2 1096328
+MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
+MD5 306b3a04f32bc0a60613ba74924a2ead 2.6.5-rc2-mm3.bz2 1233880
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.5_rc2-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.5_rc2-r3.ebuild
new file mode 100644
index 000000000000..ea42639d59be
--- /dev/null
+++ b/sys-kernel/mm-sources/mm-sources-2.6.5_rc2-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.5_rc2-r3.ebuild,v 1.1 2004/03/25 17:29:35 lostlogic Exp $
+
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/devfs-boot-hang-fix.patch"
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+RESTRICT="nomirror"
+DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
+SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
+
+KEYWORDS="x86 ~amd64 ~ia64 -*"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+existing bug. Only create a new bug if you have not found one that matches
+your issue. It is best to do an advanced search as the initial search has a
+very low yield. Please assign your bugs to x86-kernel@gentoo.org.
+Please read the ChangeLog and associated docs for more information."