From: "Fabio Erculiani" <lxnay@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/genkernel:master commit in: /, patches/iscsi/2.0-872/
Date: Tue, 22 Mar 2011 12:04:10 +0000 (UTC) [thread overview]
Message-ID: <c579bd11949a48c4757b64b561163951f829a4a6.lxnay@gentoo> (raw)
commit: c579bd11949a48c4757b64b561163951f829a4a6
Author: Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Mar 22 12:02:05 2011 +0000
Commit: Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 12:02:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=c579bd11
open-iscsi: fix compilation when openslp is installed.
Two main issues:
1. open-iscsi build system, inside Makefile, user target, calls
./configure (which is very bad itself) without letting to choose
configure options. Fixed in:
open-iscsi-2.0.872-omg-calling-configure.patch
2. when openslp support is automagically enabled, -lslp didn't get
added to compiler arguments. Fixed in:
open-iscsi-2.0.872-slp.patch
Peace.
---
gen_compile.sh | 7 ++++++-
.../open-iscsi-2.0.872-omg-calling-configure.patch | 11 +++++++++++
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 +++++++++++
3 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/gen_compile.sh b/gen_compile.sh
index b60b921..00b5de9 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -685,10 +685,15 @@ compile_iscsi() {
gen_die "ISCSI directory ${ISCSI_DIR} invalid"
print_info 1 'iSCSI: >> Compiling...'
cd "${TEMP}/${ISCSI_DIR}"
+ apply_patches iscsi ${ISCSI_VER}
# Only build userspace
+ print_info 1 'iSCSI: >> Configuring userspace...'
+ cd utils/open-isns || gen_die 'Could not enter open-isns dir'
+ ./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace'
+ cd ../.. || gen_die 'wtf?'
MAKE=${UTILS_MAKE} compile_generic "user" ""
-
+
# if kernel modules exist, copy them to initramfs, otherwise it will be compiled into the kernel
mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/"
for modname in iscsi_tcp libiscsi scsi_transport_iscsi
diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch
new file mode 100644
index 0000000..185f1ac
--- /dev/null
+++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch
@@ -0,0 +1,11 @@
+--- open-iscsi-2.0-872.orig/Makefile
++++ open-iscsi-2.0-872/Makefile
+@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example
+ all: user kernel
+
+ user: ;
+- cd utils/open-isns; ./configure; $(MAKE)
++ cd utils/open-isns; $(MAKE)
+ $(MAKE) -C utils/sysdeps
+ $(MAKE) -C utils/fwparam_ibft
+ $(MAKE) -C usr
diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch
new file mode 100644
index 0000000..16658f3
--- /dev/null
+++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch
@@ -0,0 +1,11 @@
+--- open-iscsi-2.0-872.orig/utils/open-isns/configure.ac
++++ open-iscsi-2.0-872/utils/open-isns/configure.ac
+@@ -79,7 +79,7 @@ AC_ARG_WITH(slp,
+ WITH_SLP=$withval
+ else
+ WITH_SLP=yes
+- CPPFLAGS="$CPPFLAGS -I${withval}"
++ CPPFLAGS="$CPPFLAGS -I${withval} -lslp"
+ LDFLAGS="$LDFLAGS -L${withval}"
+ fi
+ ]
next reply other threads:[~2011-03-22 12:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-22 12:04 Fabio Erculiani [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-22 18:24 [gentoo-commits] proj/genkernel:master commit in: /, patches/iscsi/2.0-872/ Fabio Erculiani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c579bd11949a48c4757b64b561163951f829a4a6.lxnay@gentoo \
--to=lxnay@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox