diff options
| author |   Stefaan De Roeck <stefaan@gentoo.org> | 2007-10-13 14:45:38 +0000 |
|---|---|---|
| committer | Stefaan De Roeck <stefaan@gentoo.org> | 2007-10-13 14:45:38 +0000 |
| commit | a131117041f36ba3154c00408ebdb0b0643c5c69 (patch) | |
| tree | d0110b71de4bc62774d23ecd42329ba6d7bca469 /net-fs/openafs-kernel | |
| parent | Fix testsuite. (diff) | |
| download | gentoo-2-a131117041f36ba3154c00408ebdb0b0643c5c69.tar.gz gentoo-2-a131117041f36ba3154c00408ebdb0b0643c5c69.tar.bz2 gentoo-2-a131117041f36ba3154c00408ebdb0b0643c5c69.zip | |
Fix problem in combination with sys-kernel/vserver-sources, fixes bug #195407
(Portage version: 2.1.3.12)
Diffstat (limited to 'net-fs/openafs-kernel')
| -rw-r--r-- | net-fs/openafs-kernel/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/files/openafs-vserver.patch | 15 | ||||
| -rw-r--r-- | net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog index f8a7632ee133..df1449f5bb54 100644 --- a/net-fs/openafs-kernel/ChangeLog +++ b/net-fs/openafs-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/openafs-kernel # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.77 2007/10/13 14:19:33 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.78 2007/10/13 14:45:37 stefaan Exp $ + + 13 Oct 2007; Stefaan De Roeck <stefaan@gentoo.org> + +files/openafs-vserver.patch, openafs-kernel-1.4.5_pre1.ebuild: + Fix problem in combination with sys-kernel/vserver-sources, fixes bug #195407 *openafs-kernel-1.4.5_pre1 (13 Oct 2007) diff --git a/net-fs/openafs-kernel/files/openafs-vserver.patch b/net-fs/openafs-kernel/files/openafs-vserver.patch new file mode 100644 index 000000000000..ff437ed5fe38 --- /dev/null +++ b/net-fs/openafs-kernel/files/openafs-vserver.patch @@ -0,0 +1,15 @@ +See https://bugs.gentoo.org/show_bug.cgi?id=195407 + +--- src/rx/LINUX/rx_knet.c.orig 2007-10-10 19:38:50.272683904 +0200 ++++ src/rx/LINUX/rx_knet.c 2007-10-10 19:39:21.542465868 +0200 +@@ -26,6 +26,10 @@ + #endif + #include <asm/uaccess.h> + ++#if defined(CONFIG_VSERVER) ++#include <linux/vs_cvirt.h> ++#endif /* CONFIG_VSERVER */ ++ + /* rxk_NewSocket + * open and bind RX socket + */ diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild index 05889a0a06e8..abc6ba33826c 100644 --- a/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild +++ b/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild,v 1.1 2007/10/13 14:19:33 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.4.5_pre1.ebuild,v 1.2 2007/10/13 14:45:37 stefaan Exp $ inherit eutils linux-mod versionator toolchain-funcs @@ -37,6 +37,7 @@ src_unpack() { epatch "${FILESDIR}"/openafs-ppc64.patch epatch "${FILESDIR}"/openafs-sparc.patch + epatch "${FILESDIR}"/openafs-vserver.patch kernel_is ge 2 6 23 && epatch "${FILESDIR}"/openafs-linux-2.6.23.patch |