summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-02-28 17:28:09 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-02-28 17:28:09 +0000
commit9336cb0f4ae75a684d2cd32e68f3498d77a98f24 (patch)
tree24030c8aeccb2219446bc036a32b07da7314d72a /sys-block/iscsitarget
parentKSRC= also required for 'emake usr' (diff)
downloadgentoo-2-9336cb0f4ae75a684d2cd32e68f3498d77a98f24.tar.gz
gentoo-2-9336cb0f4ae75a684d2cd32e68f3498d77a98f24.tar.bz2
gentoo-2-9336cb0f4ae75a684d2cd32e68f3498d77a98f24.zip
add 2.6.33 kernel support to 1.4.19
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'sys-block/iscsitarget')
-rw-r--r--sys-block/iscsitarget/ChangeLog6
-rw-r--r--sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch12
-rw-r--r--sys-block/iscsitarget/iscsitarget-1.4.19.ebuild5
3 files changed, 21 insertions, 2 deletions
diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index ecb6c7180d50..e6c25518e47e 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/iscsitarget
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.32 2010/02/28 17:14:02 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.33 2010/02/28 17:28:09 lxnay Exp $
+
+ 28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> iscsitarget-1.4.19.ebuild,
+ +files/iscsitarget-1.4.19+linux-2.6.33.patch:
+ add 2.6.33 kernel support to 1.4.19
28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> iscsitarget-1.4.19.ebuild:
KSRC= also required for 'emake usr'
diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
new file mode 100644
index 000000000000..3c2e4e426282
--- /dev/null
+++ b/sys-block/iscsitarget/files/iscsitarget-1.4.19+linux-2.6.33.patch
@@ -0,0 +1,12 @@
+diff -p -up iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33 iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c
+--- iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c.2.6.33 2010-02-21 13:07:29.000000000 +0100
++++ iscsitarget-1.4.19-1mdv2010.1/kernel/conn.c 2010-02-21 13:41:38.641365087 +0100
+@@ -43,7 +43,7 @@ void conn_info_show(struct seq_file *seq
+ switch (sk->sk_family) {
+ case AF_INET:
+ snprintf(buf, sizeof(buf),
+- "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
++ "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->inet_daddr));
+ break;
+ case AF_INET6:
+ snprintf(buf, sizeof(buf), "[%pI6]",
diff --git a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
index 8ed193d8cefe..f233aaaddacc 100644
--- a/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild
+++ b/sys-block/iscsitarget/iscsitarget-1.4.19.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-block/iscsitarget/iscsitarget-1.4.19.ebuild,v 1.2 2010/02/28 17:14:02 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.19.ebuild,v 1.3 2010/02/28 17:28:09 lxnay Exp $
inherit linux-mod eutils flag-o-matic
@@ -26,6 +26,9 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.4.15-isns-set-scn-flag.patch #180619
epatch "${FILESDIR}"/${PN}-0.4.17-build.patch
epatch "${FILESDIR}"/${PN}-1.4.18+linux-2.6.32.patch
+ if kernel_is ge 2 6 33; then
+ epatch "${FILESDIR}"/${PN}-1.4.19+linux-2.6.33.patch
+ fi
convert_to_m "${S}"/Makefile
}