summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-02-09 08:29:45 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-02-09 08:29:45 +0000
commit5b26ceec29c543faa340ca45e1b238c0f3a8543a (patch)
tree2d1f49227e9609d1e9e5479ea0941b07305709e6 /sys-block/open-iscsi
parentThe init script fails on a machine with multiple non-lo interfaces as route o... (diff)
downloadhistorical-5b26ceec29c543faa340ca45e1b238c0f3a8543a.tar.gz
historical-5b26ceec29c543faa340ca45e1b238c0f3a8543a.tar.bz2
historical-5b26ceec29c543faa340ca45e1b238c0f3a8543a.zip
Bug #383437: Fix iSNS SLP linking in the main binaries.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'sys-block/open-iscsi')
-rw-r--r--sys-block/open-iscsi/ChangeLog6
-rw-r--r--sys-block/open-iscsi/Manifest5
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch16
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.872.ebuild9
4 files changed, 30 insertions, 6 deletions
diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index c83df6f11e5b..4098cad51e48 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/open-iscsi
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.38 2012/02/01 14:21:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.39 2012/02/09 08:29:45 robbat2 Exp $
+
+ 09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> open-iscsi-2.0.872.ebuild,
+ +files/open-iscsi-2.0.872-isns-slp.patch:
+ Bug #383437: Fix iSNS SLP linking in the main binaries.
01 Feb 2012; Brent Baude <ranger@gentoo.org> open-iscsi-2.0.871.3.ebuild:
Marking open-iscsi-2.0.871.3 ppc for bug 370679
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 7c820455ca7f..25345134aef6 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -9,6 +9,7 @@ AUX open-iscsi-2.0.872-conf.d 422 RMD160 b42412fd6782537a736420d656caf3b1f436993
AUX open-iscsi-2.0.872-dont-call-configure.patch 296 RMD160 c6f4a4c1b9d7906282b2e97feab36d4758be26bf SHA1 d70e262b79d6d887f4dff4b6d8fcb77f5bc87e8b SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241
AUX open-iscsi-2.0.872-glibc212.patch 266 RMD160 604ad6250d64180d8eb668ef4e80e4835297ff5d SHA1 41eefceeaca246cc05e210eaa57c3fdc18254182 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca
AUX open-iscsi-2.0.872-init.d 2971 RMD160 a4d6abc8bd2e2d19ec81490ac0c41a43c89e870b SHA1 66b583bec26b9176e50788f0628865b17ace385c SHA256 ff62e08cd55d659ef5df1f477bd835a1d29984fd707801a9ef4d0dfe9c7caf79
+AUX open-iscsi-2.0.872-isns-slp.patch 871 RMD160 ad64013b7d7c1adbc2563a5905b255470a80c857 SHA1 de23ec2624c98e79705ce7195e2d30242d9565dc SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138
AUX open-iscsi-2.0.872-ldflags.patch 309 RMD160 d947a35dcaed347d63395e9e8c58370fcfaed33d SHA1 8d258286c2d0187a366e62a0097e2eadfacdc29d SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941
AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 RMD160 3b80ae2baa0cac7cc45240d6fc81b9f7c7286f26 SHA1 5f746bedb32dfd79b58501b0945a78be11df9d81 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd
DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d88511026605b13 SHA1 bc8253558b1a6b0c12ec0fbb0f01d6cb56d39395 SHA256 8ca6708895b17424efe20a4f6cbdf32ea44c40e7d9faa0f9c44bd720bae715ec
@@ -19,6 +20,6 @@ EBUILD open-iscsi-2.0.870.3-r1.ebuild 3063 RMD160 1d359925cb33027b1be5ab7aaddb7f
EBUILD open-iscsi-2.0.871-r1.ebuild 2580 RMD160 c7263baf111067c7016098ec971a8f5c5b4386cc SHA1 467b5930c326c7473ab7704733edae2bc4ad7436 SHA256 fd81629f599293eb565086527f1099414528fb620bbf51a1ea2130cfa217f0f3
EBUILD open-iscsi-2.0.871.3.ebuild 2564 RMD160 d745fadfa0ec9bf5b24bca51e42cdc8498d69675 SHA1 20aa4def05cd16242d330c9a17c7ee39c8896d51 SHA256 47c655f1da09451d18812965074d8a164dc417064bef584738b964bf88e5ecf7
EBUILD open-iscsi-2.0.871.ebuild 3148 RMD160 24d72a0703ebacbb7f696aabb58087d6ef290b72 SHA1 42f9b5f3500113a1a5b0e3ceb64a5443d4473295 SHA256 89724af6ae57f974c653eec749df99a59d8308436f148781f4b8885844e31a89
-EBUILD open-iscsi-2.0.872.ebuild 2895 RMD160 bf217ee736c6891558aa9318aacd6727b12ae688 SHA1 419909899c51a92e5e19d7251dce0982488f7c30 SHA256 5670a28a9a3fbf63021e926ba8d1397e2fc0e0f4267adb17963b1f867385db9a
-MISC ChangeLog 8441 RMD160 5269c33e2c2abf73ec35c4192a05a06e4007030f SHA1 d9374bff6d16f41d02196373af32a8e91cd6c431 SHA256 056cdc2db36e73e3dd63faa03ae0378659555c98791846ddb9b206edb03e9302
+EBUILD open-iscsi-2.0.872.ebuild 3005 RMD160 2d9d59e65592eb94781bd0d4c3460620b3ecc358 SHA1 d2716580d4973fcffc61a4ca214b4826595cd3dc SHA256 23b09e3dfe1893de0820353a513b985c9e04c07b1b47e13015815d40cf43fd59
+MISC ChangeLog 8625 RMD160 dd99538073d7c37660f21ff7103ac54f7595992d SHA1 a67f317104d649ad0662282b3fb89360653bff5b SHA256 8f2cf74968ce12a80e2a07051b73e7a828635de69ea8fabf2c269f93b30a958e
MISC metadata.xml 358 RMD160 151359f69c3aaca1234142bb4bfc10672d889db0 SHA1 c66b54154a95aed7882dca23751cfac819045a66 SHA256 4ab139872bd983e7fb651198aa9aadd1053ed613568bfdbcb612bfc508b8f856
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch
new file mode 100644
index 000000000000..db280a3dd862
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch
@@ -0,0 +1,16 @@
+diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile
+--- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000
++++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000
+@@ -53,10 +53,10 @@
+
+ iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
+ iscsid.o session_mgmt.o discoveryd.o
+- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto
+
+ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
+- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto
+
+ iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ iscsistart.o statics.o
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
index 839054a624bd..cfcc3c9f78a4 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.3 2011/11/05 23:03:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.4 2012/02/09 08:29:45 robbat2 Exp $
EAPI=2
inherit versionator linux-info eutils flag-o-matic
@@ -45,6 +45,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-glibc212.patch
epatch "${FILESDIR}"/${P}-dont-call-configure.patch
epatch "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-isns-slp.patch
}
src_configure() {
@@ -56,8 +57,10 @@ src_compile() {
use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
einfo "Building userspace"
+ local SLP_LIBS
+ use slp && SLP_LIBS="-lslp"
cd "${S}" && \
- KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
+ KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" user \
|| die "emake failed"
}