diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2009-08-17 10:18:34 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2009-08-17 10:18:34 +0000 |
| commit | aa98c8600ad8f66e3aad2db83eb26c0743487576 (patch) | |
| tree | 3d10c887232397f091fe3222efc8f755fccc3c40 /sys-cluster/drbd-kernel | |
| parent | Non-maintainer commit: Version bump for security bug 278824. (diff) | |
| download | gentoo-2-aa98c8600ad8f66e3aad2db83eb26c0743487576.tar.gz gentoo-2-aa98c8600ad8f66e3aad2db83eb26c0743487576.tar.bz2 gentoo-2-aa98c8600ad8f66e3aad2db83eb26c0743487576.zip | |
Fixed compilation on recent kernels. Marked stable on x86 and amd64.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-cluster/drbd-kernel')
| -rw-r--r-- | sys-cluster/drbd-kernel/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild | 3 | ||||
| -rw-r--r-- | sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch | 12 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-cluster/drbd-kernel/ChangeLog b/sys-cluster/drbd-kernel/ChangeLog index 45613a96376f..60a664375a94 100644 --- a/sys-cluster/drbd-kernel/ChangeLog +++ b/sys-cluster/drbd-kernel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/drbd-kernel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.16 2009/03/29 19:43:20 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/ChangeLog,v 1.17 2009/08/17 10:18:34 xmerlin Exp $ + + 17 Aug 2009; Christian Zoffoli <xmerlin@gentoo.org> + +files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch, + drbd-kernel-8.0.16.ebuild: + Fixed compilation on recent kernels. Marked stable on x86 and amd64. *drbd-kernel-8.0.16 (29 Mar 2009) diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild index a011f54470ef..97f0d627a4b4 100644 --- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild +++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild,v 1.1 2009/03/29 19:43:20 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild,v 1.2 2009/08/17 10:18:34 xmerlin Exp $ inherit eutils versionator linux-mod @@ -41,6 +41,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die + epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die } pkg_postinst() { diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch new file mode 100644 index 000000000000..c7b4f814077e --- /dev/null +++ b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch @@ -0,0 +1,12 @@ +--- drbd-8.0.16/drbd/drbd_main.c.orig 2009-08-04 17:55:52.000000000 +0300 ++++ drbd-8.0.16/drbd/drbd_main.c 2009-08-04 17:56:35.000000000 +0300 +@@ -2770,7 +2770,9 @@ + } + + drbd_proc->proc_fops = &drbd_proc_fops; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) + drbd_proc->owner = THIS_MODULE; ++#endif + #else + # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)" + #endif |