summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-01-06 12:45:15 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-01-06 12:45:15 +0000
commitd64327614ca09fa183b5844d77c37b354b97f2fc (patch)
tree14aa72cb04f75dde694e79bc6af8b401a2324960 /sys-kernel
parentversion bump (diff)
downloadgentoo-2-d64327614ca09fa183b5844d77c37b354b97f2fc.tar.gz
gentoo-2-d64327614ca09fa183b5844d77c37b354b97f2fc.tar.bz2
gentoo-2-d64327614ca09fa183b5844d77c37b354b97f2fc.zip
Revbump with patch which fixes kernel configuration issue
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/zen-sources/ChangeLog14
-rw-r--r--sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch20
-rw-r--r--sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild (renamed from sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild)1
3 files changed, 34 insertions, 1 deletions
diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 9cc68d055c8f..5ae40383f327 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for sys-kernel/zen-sources
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.21 2010/01/03 22:00:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.22 2010/01/06 12:45:14 hwoarang Exp $
+
+*zen-sources-2.6.33_rc2_p1-r1 (06 Jan 2010)
+
+ 06 Jan 2010; <hwoarang@gentoo.org> -zen-sources-2.6.33_rc2_p1.ebuild,
+ +zen-sources-2.6.33_rc2_p1-r1.ebuild,
+ +files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch:
+ Bump to fix a kernel configuration issue which is not fixed on zen-sources
+ git
+ repository
+ Related commit:
+ http://git.zen-kernel.org/?p=kernel/zen.git;a=commitdiff;h=3764e86df27a810
+ 77ed043ce5c659c7970541371
03 Jan 2010; Alex Alexander <wired@gentoo.org>
zen-sources-2.6.30_p11.ebuild, zen-sources-2.6.31_p8.ebuild,
diff --git a/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch b/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch
new file mode 100644
index 000000000000..77f0db707e3f
--- /dev/null
+++ b/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch
@@ -0,0 +1,20 @@
+X-Git-Url: http://git.zen-kernel.org/?p=kernel%2Fzen.git;a=blobdiff_plain;f=kernel%2Fsysctl.c;h=3232e2f9019635b5536fc4cd49f9a55ea33f016d;hp=98ebfe1b5859e5269877c8daee4104787002af58;hb=3764e86df27a81077ed043ce5c659c7970541371;hpb=e6e35ff4f4de3d5c0929a3fd34801803445a1d1e
+
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index 98ebfe1..3232e2f 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -237,13 +237,11 @@ static struct ctl_table root_table[] = {
+ },
+ #ifdef CONFIG_FB_CON_DECOR
+ {
+- .ctl_name = CTL_UNNUMBERED,
+ .procname = "fbcondecor",
+ .data = &fbcon_decor_path,
+ .maxlen = KMOD_PATH_LEN,
+ .mode = 0644,
+ .proc_handler = &proc_dostring,
+- .strategy = &sysctl_string,
+ },
+ #endif
+
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild
index 3d6d58d69ef4..fc294b183a1d 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild
@@ -48,6 +48,7 @@ src_unpack(){
kernel-2_src_unpack
cd "${S}"
epatch "${DISTDIR}"/"${ZEN_FILE}"
+ epatch "${FILESDIR}"/"${P}-kernel-sysctl.c.patch"
}
K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \