Added a patch to fix bug #35123.

4 files changed, 41 insertions, 4 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index c2c928b8d765..8297e8fefcc6 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.45 2003/12/04 22:09:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.46 2003/12/05 23:55:03 plasmaroo Exp $
+
+  05 Dec 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.22-r1.ebuild,
+  files/gentoo-sources-2.4.22-kmsgdump.patch:
+  Added a fix to fix a "CONFIG_LOG_BUF_SHIFT" problem as
+  include/asm-i386/kmsgdump.h was not updated for some reason. Thanks to
+  Leandro Dorileo <leandro at inforagro.dom.br> for the patch. This closes
+  bug #35123.
 
   03 Dec 2003; Brian Jackson <iggy@gentoo.org>
   gentoo-sources-2.4.20-r9.ebuild, files/do_brk_fix.patch:
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index c0ea54651387..f25bc1833793 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,6 +1,6 @@
-MD5 b82068ab5ee9cfa401f412b3b387a95d ChangeLog 12147
+MD5 6ab76d9dbeb5a51afe4c6eb68aba12dc ChangeLog 12484
 MD5 1af785c8a3f44b880753f316bb4970f3 gentoo-sources-2.4.22.ebuild 1911
-MD5 18e30dca6be96fa965c366d3d123a986 gentoo-sources-2.4.22-r1.ebuild 1895
+MD5 51d342166d91ae444e1a22c0319bb5ae gentoo-sources-2.4.22-r1.ebuild 1944
 MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
 MD5 32c2163cad1c7253c80be7b369602b92 gentoo-sources-2.4.20-r8.ebuild 5557
 MD5 f44bfa5126842e2f7868d584c7f9e6ea gentoo-sources-2.4.19-r10.ebuild 2357
@@ -29,6 +29,7 @@ MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r8 145
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r5 145
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
 MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r10 146
 MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
 MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-kmsgdump.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-kmsgdump.patch
new file mode 100644
index 000000000000..095f93e9f0bb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.22-kmsgdump.patch
@@ -0,0 +1,27 @@
+--- linux-2.4.22-gentoo-r1/include/asm-i386/kmsgdump.h.orig	2003-12-05 14:47:30.000000000 -0800
++++ linux-2.4.22-gentoo-r1.plasmaroo/include/asm-i386/kmsgdump.h	2003-12-05 14:49:44.000000000 -0800
+@@ -8,8 +8,23 @@
+  */
+ 
+ /* LOG_BUF_LEN : should match </usr/src/linux/kernel/printk.c>'s */
++#include <linux/config.h>
+ #ifndef LOG_BUF_LEN
+-#define LOG_BUF_LEN     (16384)
++
++#if !defined(CONFIG_LOG_BUF_SHIFT) || (CONFIG_LOG_BUF_SHIFT - 0 == 0)
++#if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64)
++#define LOG_BUF_LEN     (65536)
++#elif defined(CONFIG_ARCH_S390)
++#define LOG_BUF_LEN     (131072)
++#elif defined(CONFIG_SMP)
++#define LOG_BUF_LEN     (32768)
++#else
++#define LOG_BUF_LEN     (16384)                 /* This must be a power of two */
++#endif
++#else /* CONFIG_LOG_BUF_SHIFT */
++#define LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
++#endif
++
+ #endif
+ 
+ #define	CODEORIGIN	0x0700
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild
index b28efee33926..b7d47d865990 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild,v 1.2 2003/12/04 22:08:44 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r1.ebuild,v 1.3 2003/12/05 23:55:03 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -38,6 +38,8 @@ src_unpack() {
 		|| die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
 
 	cd ${S}
+	epatch ${FILESDIR}/${PN}-${OKV}-kmsgdump.patch
+
 	make mrproper || die "make mrproper failed"
 	make include/linux/version.h || die "make include/linux/version.h failed"
 }