summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-01-15 01:28:21 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-01-15 01:28:21 +0000
commit0d2e90720d541cc74b19f043058212791683ad8b (patch)
tree1b1005c3ddc305f4feb4095c27e80e2af5d9b72a /sys-block
parentVersion bump for various bug fixes. This is a stable candidate. (diff)
downloadhistorical-0d2e90720d541cc74b19f043058212791683ad8b.tar.gz
historical-0d2e90720d541cc74b19f043058212791683ad8b.tar.bz2
historical-0d2e90720d541cc74b19f043058212791683ad8b.zip
Fix patch to build properly.
Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/iscsitarget/ChangeLog6
-rw-r--r--sys-block/iscsitarget/Manifest10
-rw-r--r--sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch4
3 files changed, 13 insertions, 7 deletions
diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index 163b874b8d2d..caf87122e795 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/iscsitarget
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.20 2009/01/02 23:46:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.21 2009/01/15 01:28:20 flameeyes Exp $
+
+ 15 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/iscsitarget-0.4.17+linux-2.6.28.patch:
+ Fix patch to build properly.
02 Jan 2009; Diego E. Pettenò <flameeyes@gentoo.org>
-files/iscsitarget-0.4.15-build.patch,
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index d90fd9cfef1f..5a54c320abd9 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
AUX ietd-conf.d 1073 RMD160 ade5301c8e2eb8cbc16dfae4bfa80e22393e2953 SHA1 1bb990e26b847169d4937e5d2fc28a5f86d55003 SHA256 28c4a6ddfe555d9f400513de04e2e44473263c4505434fc6e926d2b2fe89c414
AUX ietd-init.d-2 2492 RMD160 5ab62e5b1f0edd17bb296d4f61c8c7ff562b3d02 SHA1 d91acd801928673e7d03639f8c9e4bf7008ebe43 SHA256 403884a4a90c475689d0fd6deb3bffa402cf4b7a0b215cc0cad219ebf9c00ee2
AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 RMD160 9a3b091eafb3d213a0c830a691684e0dc1f04b9c SHA1 9d80a8d1b5069e6ec5252ed8b1636023288bada2 SHA256 dc99ad8fa1cc10f6c6af4c99374dd0da14d3a56aebee2c48dd02cd8e156f9996
-AUX iscsitarget-0.4.17+linux-2.6.28.patch 2286 RMD160 f8fabf25a73a838d709bdf1ae836680a7fbb0606 SHA1 8bf1d12312a7fdfef274330a7b1bb5847d94795b SHA256 8080c3a5c5892d640ad1caa0a6cefe6e5b755ed291050a0b8dc604188cf53910
+AUX iscsitarget-0.4.17+linux-2.6.28.patch 2316 RMD160 e2b1ca2e4f5cab54b027f1cf1bffdcdd648db7fd SHA1 a262a08478a00c1f0457807431c06a969d4498c8 SHA256 0031bb57ae38208d5b97f0fe6c3630293ea71f369d6c744585f69897229a11f0
AUX iscsitarget-0.4.17-build.patch 580 RMD160 a770b10dfc4f7c16daefa3e5e0827d1a2164e470 SHA1 81d46f22fd9ff73dbe7baa1792706c79c5ed7a2a SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d
DIST iscsitarget-0.4.16_p162.tar.bz2 84559 RMD160 df48d9f8b0416cd47f926257801c8357ea1ea7b6 SHA1 163d3272f859b7f04900d5a56856140c083b90c1 SHA256 306f98bd2d1847f97cd079f31239cfb72640606e560b8e1d6e01b263fda501b7
DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778
EBUILD iscsitarget-0.4.16_p162.ebuild 1752 RMD160 a4d2ffbfebb7f63199d845bc0d2ce6147e3b8e7b SHA1 c885ebb14c17e0f9e38aaeb864cbfb1d24cc77eb SHA256 44694ee74025415c16c30f8914e6fe0863dcdcafe2e9932aafbdf12e9212c961
EBUILD iscsitarget-0.4.17.ebuild 1825 RMD160 ec43614157a659422528c2004ff28dc8519d689a SHA1 33a2a50c37b7a451aaecc61cf9489ee79c88c0de SHA256 3ab35eb071f882678b7cdb27c8a86f34eec754866bbc678cebb65ab84f629625
-MISC ChangeLog 4233 RMD160 4195173cb112e1775f6f2bc26ef282d00b032849 SHA1 1780019fbc0b20f85430420a97c18ff9e315b5de SHA256 f5de8f42edb2b1a072e75bd28ef34e98b4efce41d2789e766d5553b0e860db22
+MISC ChangeLog 4368 RMD160 4de3c72af6cd9036c1ad891e3f2cdac17748ac0e SHA1 abf2eab3d9ab482c37017784ca1c1e68a90c1fb2 SHA256 c14c5b71d04b3042aac1f9d64df1726738b166402c237f70b2eba2474938b0a3
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAklep00ACgkQAiZjviIA2XirmwCfSRPvhSIbatx0R+j2PEgNUDJc
-KtYAnibRHCsEbObazPvZeNpjuB42g7jN
-=TS4G
+iEYEARECAAYFAklukUcACgkQAiZjviIA2XispwCdFNncF8JWKv1bkOE1wXMxfCO2
+vAEAoKU5zVacGUaAF+V7uplNY5pCash9
+=WMwk
-----END PGP SIGNATURE-----
diff --git a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
index 0c11074f0b44..ec35cd526f4c 100644
--- a/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
+++ b/sys-block/iscsitarget/files/iscsitarget-0.4.17+linux-2.6.28.patch
@@ -18,10 +18,12 @@ diff --git a/kernel/block-io.c b/kernel/block-io.c
index e4a25f7..2c5f6f6 100644
--- a/kernel/block-io.c
+++ b/kernel/block-io.c
-@@ -18,6 +18,12 @@
+@@ -18,6 +18,14 @@
#include "iscsi_dbg.h"
#include "iotype.h"
++#include <linux/version.h>
++
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+# define HAVE_OPEN_BDEV_EXCLUSIVE 1
+#else