summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-03-05 14:19:34 +0000
committerPeter Volkov <pva@gentoo.org>2010-03-05 14:19:34 +0000
commitff0ac0592160c448730d552bb1cc33e3bce7fc84 (patch)
tree631233118d658906bc8f9af8030ea7370a94287d /sys-fs/vhba
parentstable x86, bug 305991 (diff)
downloadgentoo-2-ff0ac0592160c448730d552bb1cc33e3bce7fc84.tar.gz
gentoo-2-ff0ac0592160c448730d552bb1cc33e3bce7fc84.tar.bz2
gentoo-2-ff0ac0592160c448730d552bb1cc33e3bce7fc84.zip
Added patch to fix compatibility with 2.6.33 kernels, bug 303146 thank Rion for catching upstream fix fast.
(Portage version: 2.2_rc62/cvs/Linux i686)
Diffstat (limited to 'sys-fs/vhba')
-rw-r--r--sys-fs/vhba/ChangeLog7
-rw-r--r--sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.33.patch14
-rw-r--r--sys-fs/vhba/vhba-1.2.1.ebuild5
3 files changed, 23 insertions, 3 deletions
diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog
index b5e7f2736ff6..ff9e01d85311 100644
--- a/sys-fs/vhba/ChangeLog
+++ b/sys-fs/vhba/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/vhba
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.15 2010/02/01 20:03:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.16 2010/03/05 14:19:34 pva Exp $
+
+ 05 Mar 2010; Peter Volkov <pva@gentoo.org> vhba-1.2.1.ebuild,
+ +files/vhba-1.2.1-kernel-2.6.33.patch:
+ Added patch to fix compatibility with 2.6.33 kernels, bug 303146 thank
+ Rion for catching upstream fix fast.
01 Feb 2010; Peter Volkov <pva@gentoo.org> -vhba-1.0.0.ebuild,
-vhba-1.1.0.ebuild:
diff --git a/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.33.patch b/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.33.patch
new file mode 100644
index 000000000000..68e12dcb6ee2
--- /dev/null
+++ b/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.33.patch
@@ -0,0 +1,14 @@
+--- trunk/vhba-module/kat/have_scsi_macros.c 2010/03/01 19:11:48 673
++++ trunk/vhba-module/kat/have_scsi_macros.c 2010/03/05 10:50:24 674
+@@ -1,4 +1,3 @@
+-#include <linux/autoconf.h>
+ #include <scsi/scsi_cmnd.h>
+
+ void testfunc (void);
+--- trunk/vhba-module/kat/scatterlist_has_page_link.c 2010/03/01 19:11:48 673
++++ trunk/vhba-module/kat/scatterlist_has_page_link.c 2010/03/05 10:50:24 674
+@@ -1,4 +1,3 @@
+-#include <linux/autoconf.h>
+ #include <linux/scatterlist.h>
+
+ /* Note: scatterlist.page_link is used in kernel (2.6.24 <= version < X) */
diff --git a/sys-fs/vhba/vhba-1.2.1.ebuild b/sys-fs/vhba/vhba-1.2.1.ebuild
index 3dba1d972fb8..7c6dea58b592 100644
--- a/sys-fs/vhba/vhba-1.2.1.ebuild
+++ b/sys-fs/vhba/vhba-1.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.5 2010/02/01 20:02:00 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.6 2010/03/05 14:19:34 pva Exp $
EAPI="2"
@@ -32,7 +32,8 @@ pkg_setup() {
src_prepare() {
epatch \
"${FILESDIR}/${PV}-parallel_build.patch" \
- "${FILESDIR}/${PV}-kerneldir.patch"
+ "${FILESDIR}/${PV}-kerneldir.patch" \
+ "${FILESDIR}/${P}-kernel-2.6.33.patch"
}
src_install() {