Fixed build issue with 2.6.34 kernels, bug #317119, thank Rion for report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog
index ff9e01d85311f7a6f4c95c2f402e6c55fe24a800..29f7388acb57eaf8c78d8ad1ddfbd9fe439f1d01 100644 (file)
--- a/sys-fs/vhba/ChangeLog
+++ b/sys-fs/vhba/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2010/03/05 14:19:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.17 2010/04/26 19:40:36 pva Exp $
+
+  26 Apr 2010; Peter Volkov <pva@gentoo.org>
+  +files/vhba-1.2.1-kernel-2.6.34.patch:
+  Fixed build issue with 2.6.34 kernels, bug #317119, thank Rion for report.
 
   05 Mar 2010; Peter Volkov <pva@gentoo.org> vhba-1.2.1.ebuild,
   +files/vhba-1.2.1-kernel-2.6.33.patch:

diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index f233079f39db218203b52a15d0b485cb4ddcc45d..0c530b76721516187ae6f8cd0b2e9d21885da87e 100644 (file)
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -4,7 +4,8 @@ AUX vhba-1.0.0-makefile.patch 778 RMD160 4782607437fd3f55162d3086472933376b574d9
 AUX vhba-1.0.0-scatterlist.patch 583 RMD160 7d1af6d447705df0644056258f67a0cb74a43381 SHA1 ba11da0b2c77b3ad47f8185fc134716c20568fb3 SHA256 eae66a805ee1e599f65ff5487ba2e8535a30d5d8a9cc8a8b95d166425e65fc95
 AUX vhba-1.0.0-scsicmnd.patch 2736 RMD160 503eb663d33fa082eceab87d2521b9d2dab469b9 SHA1 4ded720928b7483fe89da43712bf8952acb854e3 SHA256 da335b69398cf92dbd72db4c320939d6fa2530c60c0482eb2d629ce3724100ca
 AUX vhba-1.2.1-kernel-2.6.33.patch 549 RMD160 bf721cc0713a8b3dc3d53663e6dcfc29c8b8282e SHA1 f3db205d4b653229681c53d48162e9572ff1ca5e SHA256 370f0c77775d5646537aba809f5adfd0d11c7ddb8fdd4f6572dd541aad4b675e
+AUX vhba-1.2.1-kernel-2.6.34.patch 517 RMD160 43906e3240da7f85eb6f27fe0672ae7a8a2a3647 SHA1 c89de77d3c6dc86bf8b149968d5865c08d49235a SHA256 379e968a94e8b4736c01ccbe2635dec22371b0885a37cea1a685dc403c5c4989
 DIST vhba-module-1.2.1.tar.bz2 6585 RMD160 ecdbbd40f34b68816b0eefe43a64a4c664b31580 SHA1 5226b3dd16d793cd58a712e8ca44f3b45194e248 SHA256 1ab729d029c49e5e6231cdec3b9f88f17c44a292fe77f2bfbab506b62999a3ae
-EBUILD vhba-1.2.1.ebuild 1544 RMD160 096b8b8e64ae2b757f08d2076d58c8cfc19bc749 SHA1 b70de76c00472f78895a5ab194e9b23c6cdb6950 SHA256 35e91be9c66cea0bbad62a3b427a933bbf2a15765aec547c95b8ae69cfe82575
-MISC ChangeLog 3633 RMD160 6c37f2750109e8feda2fff50c792f75dd58dbf42 SHA1 52fb5800f93c85710a186931a786b45995b55c96 SHA256 723c3e2a27a1e56aaae1f8b1872712dc5d16199817d2472b0b23854ef3b6f72a
+EBUILD vhba-1.2.1.ebuild 1587 RMD160 859fb63c322df9c9b6b20f00dcb1a7a5c65eda55 SHA1 d89c1db99a407a39d0a47898dfdfcd2794b3d05d SHA256 71535d710b33be182d09365aa3e9231c24c454a37231a6628786052cd9e0e0b6
+MISC ChangeLog 3797 RMD160 751829116c4da5e6b1f609c2beb7707d8df40626 SHA1 790178f6846d05aa4877155aeb271536b9ff22cd SHA256 b3aaebaaee190ce8f6a14a8cfd475fa5aba1deef17f16fcc158f42f1018e2ce7
 MISC metadata.xml 225 RMD160 461e7786d6f2b4ad0796cdbd8da127d2aa1d9c88 SHA1 7e14b4551dd441a467b812e3b4c4f3fd795e5a58 SHA256 1c4c96d3ac062761d9e938c233751ff32b23e2c21aff1e38df6a37ffa0e97cb1

diff --git a/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.34.patch b/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.34.patch
new file mode 100644 (file)
index 0000000..1ec5112
--- /dev/null
+++ b/sys-fs/vhba/files/vhba-1.2.1-kernel-2.6.34.patch
@@ -0,0 +1,15 @@
+http://cdemu.svn.sourceforge.net/viewvc/cdemu/trunk/vhba-module/vhba.c?r1=678&r2=677&pathrev=678
+https://sourceforge.net/tracker/?func=detail&atid=603423&aid=2992162&group_id=93175
+http://bugs.gentoo.org/show_bug.cgi?id=317119
+
+--- vhba.c     2010-04-26 19:35:04 +0000
++++ vhba.c     2010-04-26 19:35:20 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/platform_device.h>
+ #include <linux/miscdevice.h>
+ #include <linux/poll.h>
++#include <linux/slab.h>
+ #include <asm/uaccess.h>
+ #include <scsi/scsi.h>
+ #include <scsi/scsi_host.h>
+

diff --git a/sys-fs/vhba/vhba-1.2.1.ebuild b/sys-fs/vhba/vhba-1.2.1.ebuild
index 7c6dea58b592bee2e40813a0b0081827af55d9ab..23bd65bcd376f3096d25fb4f1cac32eecd98168a 100644 (file)
--- 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.6 2010/03/05 14:19:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.7 2010/04/26 19:40:36 pva Exp $
 
 EAPI="2"
 
@@ -33,7 +33,8 @@ src_prepare() {
        epatch \
                "${FILESDIR}/${PV}-parallel_build.patch" \
                "${FILESDIR}/${PV}-kerneldir.patch" \
-               "${FILESDIR}/${P}-kernel-2.6.33.patch"
+               "${FILESDIR}/${P}-kernel-2.6.33.patch" \
+               "${FILESDIR}/${P}-kernel-2.6.34.patch"
 }
 
 src_install() {