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
commit4fc9b1e976d81da74e8599438ed6e0f0a3dddf67 (patch)
treeffa822d7711fcaa76c801577ebdbb29239fb5689
parentstable x86, bug 305991 (diff)
downloadhistorical-4fc9b1e976d81da74e8599438ed6e0f0a3dddf67.tar.gz
historical-4fc9b1e976d81da74e8599438ed6e0f0a3dddf67.tar.bz2
historical-4fc9b1e976d81da74e8599438ed6e0f0a3dddf67.zip
Added patch to fix compatibility with 2.6.33 kernels, bug 303146 thank Rion for catching upstream fix fast.
Package-Manager: portage-2.2_rc62/cvs/Linux i686
-rw-r--r--sys-fs/vhba/ChangeLog7
-rw-r--r--sys-fs/vhba/Manifest5
-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
4 files changed, 26 insertions, 5 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/Manifest b/sys-fs/vhba/Manifest
index e87235f0ab70..f233079f39db 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -3,7 +3,8 @@ AUX 1.2.1-parallel_build.patch 407 RMD160 ea79001e78a46fa3e0e317cbd46b84e320d374
AUX vhba-1.0.0-makefile.patch 778 RMD160 4782607437fd3f55162d3086472933376b574d90 SHA1 61f7b098c654bb83b117c0760e4c8c9d365d8282 SHA256 ff8512f15f13de655c39168a9e000a5a3dfd6ae8b89789bc3ae6c8610ae6725a
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
DIST vhba-module-1.2.1.tar.bz2 6585 RMD160 ecdbbd40f34b68816b0eefe43a64a4c664b31580 SHA1 5226b3dd16d793cd58a712e8ca44f3b45194e248 SHA256 1ab729d029c49e5e6231cdec3b9f88f17c44a292fe77f2bfbab506b62999a3ae
-EBUILD vhba-1.2.1.ebuild 1501 RMD160 d01b8b280d59edd0bcc39baa6df8d6d521af90f9 SHA1 5ac14221934148fc87e99709c8fc152f78f692b6 SHA256 e5e894079e098540d5171dac3ef52bbf1527d3732efa8c61e9e1ae016f99076c
-MISC ChangeLog 3415 RMD160 1344959fbbe532831396ba9882fef6e92927cdfe SHA1 78f0f85e1cf7aa7bc0a5d370d9112e84bd522a85 SHA256 23d03f1eab938f0094a4161aaa7cea8e58125ad0dfe24f872b7d9fd8d3400a7d
+EBUILD vhba-1.2.1.ebuild 1544 RMD160 096b8b8e64ae2b757f08d2076d58c8cfc19bc749 SHA1 b70de76c00472f78895a5ab194e9b23c6cdb6950 SHA256 35e91be9c66cea0bbad62a3b427a933bbf2a15765aec547c95b8ae69cfe82575
+MISC ChangeLog 3633 RMD160 6c37f2750109e8feda2fff50c792f75dd58dbf42 SHA1 52fb5800f93c85710a186931a786b45995b55c96 SHA256 723c3e2a27a1e56aaae1f8b1872712dc5d16199817d2472b0b23854ef3b6f72a
MISC metadata.xml 225 RMD160 461e7786d6f2b4ad0796cdbd8da127d2aa1d9c88 SHA1 7e14b4551dd441a467b812e3b4c4f3fd795e5a58 SHA256 1c4c96d3ac062761d9e938c233751ff32b23e2c21aff1e38df6a37ffa0e97cb1
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() {