c2d5d21256
minor context fixes after rebase of out-of-tree patches iscsiuio is merged upstream, remove old source archive and patches spec cleanups to fix rpmlint issues
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From c9ff6b4ce766a25da4a2e9f9f4836139c9c2331e Mon Sep 17 00:00:00 2001
|
|
From: Eddie Wai <eddie.wai@broadcom.com>
|
|
Date: Fri, 15 Feb 2013 16:58:37 -0800
|
|
Subject: ISCSID: Modified the Makefile for iscsiuio compilation
|
|
|
|
This patch modifies the open-iscsi Makefile to include the compilation,
|
|
binary/manpage install, and clean of the iscsiuio source.
|
|
|
|
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
|
|
---
|
|
Makefile | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index c5d9700..0b7bb98 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -14,8 +14,8 @@ mandir = $(prefix)/share/man
|
|
etcdir = /etc
|
|
initddir = $(etcdir)/init.d
|
|
|
|
-MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8
|
|
-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname
|
|
+MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 iscsiuio/docs/iscsiuio.8
|
|
+PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi_discovery utils/iscsi-iname iscsiuio/src/unix/iscsiuio
|
|
INSTALL = install
|
|
ETCFILES = etc/iscsid.conf
|
|
IFACEFILES = etc/iface.example
|
|
@@ -26,24 +26,29 @@ IFACEFILES = etc/iface.example
|
|
|
|
all: user
|
|
|
|
-user: utils/open-isns/Makefile
|
|
+user: utils/open-isns/Makefile iscsiuio/Makefile
|
|
$(MAKE) -C utils/open-isns
|
|
$(MAKE) -C utils/sysdeps
|
|
$(MAKE) -C utils/fwparam_ibft
|
|
$(MAKE) -C usr
|
|
$(MAKE) -C utils
|
|
+ $(MAKE) -C iscsiuio
|
|
@echo
|
|
@echo "Compilation complete Output file"
|
|
@echo "----------------------------------- ----------------"
|
|
@echo "Built iSCSI daemon: usr/iscsid"
|
|
@echo "Built management application: usr/iscsiadm"
|
|
@echo "Built boot tool: usr/iscsistart"
|
|
+ @echo "Built iscsiuio daemon: iscsiuio/src/unix/iscsiuio"
|
|
@echo
|
|
@echo "Read README file for detailed information."
|
|
|
|
utils/open-isns/Makefile: utils/open-isns/configure utils/open-isns/Makefile.in
|
|
cd utils/open-isns; ./configure CFLAGS="$(OPTFLAGS)" --with-security=no
|
|
|
|
+iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
|
|
+ cd iscsiuio; ./configure
|
|
+
|
|
kernel: force
|
|
$(MAKE) -C kernel
|
|
@echo "Kernel Compilation complete Output file"
|
|
@@ -61,6 +66,7 @@ clean:
|
|
$(MAKE) -C utils clean
|
|
$(MAKE) -C usr clean
|
|
$(MAKE) -C kernel clean
|
|
+ $(MAKE) -C iscsiuio clean
|
|
$(MAKE) -C utils/open-isns clean
|
|
$(MAKE) -C utils/open-isns distclean
|
|
|
|
--
|
|
1.8.1.4
|
|
|