[openfabrics-ewg] [PATCH 1/2] Add VNIC tools to usermode package configure and Makefile

[Ramachandra K]

Add the QLogic VNIC tools, qlvnictools, to the OFED usermode package


Signed-off-by: Ramachandra K <ramachandra.kuchimanchi at qlogic.com>
---

 Makefile  |   24 ++++++++++++++++++++++--
 configure |   18 ++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6dee38b..fbaaee0 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all:
 .PHONY: libipathverbs install_libipathverbs libehca install_libehca 
 .PHONY: libcxgb3 install_libcxgb3
 .PHONY: install_libibumad install_libibmad install_osm install_diags install_mstflint install_perftest
-.PHONY: srptools install_srptools ipoibtools install_ipoibtools
+.PHONY: srptools install_srptools ipoibtools install_ipoibtools qlvnictools install_qlvnictools
 	
 .DELETE_ON_ERROR:
 
@@ -70,6 +70,11 @@ user:	srptools
 install_user:	install_srptools
 endif
 
+ifeq ($(WITH_QLVNICTOOLS),yes)
+user:	qlvnictools
+install_user:	install_qlvnictools
+endif
+
 ifeq ($(WITH_IPOIBTOOLS),yes)
 user:	ipoibtools
 install_user:	install_ipoibtools
@@ -172,6 +177,14 @@ srptools: libibverbs libibumad libibcomm
 	    -L../management/libibcommon/.libs -libcommon"
 	@echo "Make srptools done"
 
+qlvnictools: libibverbs libibumad libibcommon
+	$(MAKE) -C $(SRC)userspace/qlvnictools/ibvexdmtools \
+	CPPFLAGS="-I../../libibverbs/include -I../../management/libibumad/include -
I../../management/libibcommon/include" \
+	AM_LDFLAGS="-L../../libibverbs/src/.libs -libverbs \
+	-L../../management/libibumad/.libs -libumad \
+	    -L../../management/libibcommon/.libs -libcommon"
+	@echo "Make qlvnictools done"
+
 ipoibtools:
 	$(MAKE) -C $(SRC)userspace/ipoibtools
 	$(MAKE) -C $(SRC)userspace/ipoibtools/iproute2 ip
@@ -372,6 +385,11 @@ install_perftest:	install_libibverbs ins
 		
 install_srptools:
 	$(MAKE) -C $(SRC)userspace/srptools install
+
+install_qlvnictools:
+	$(MAKE) -C $(SRC)userspace/qlvnictools/ibvexdmtools install
+	install -m 0754 $(SRC)userspace/qlvnictools/ql_vnic /etc/init.d/
+	install -m 0754 $(SRC)userspace/qlvnictools/vnic_parser.pl /usr/local/sbin
 		
 install_ipoibtools:
 	install -d $(DESTDIR)/$(prefix)/bin
@@ -404,6 +422,7 @@ clean_user:
 	# $(MAKE) -C $(SRC)userspace/useraccess-lib clean
 	$(MAKE) -C $(SRC)userspace/perftest clean
 	$(MAKE) -C $(SRC)userspace/srptools clean
+	$(MAKE) -C $(SRC)userspace/qlvnictools/ibvexdmtools clean
 	$(MAKE) -C $(SRC)userspace/ipoibtools clean
 	$(MAKE) -C $(SRC)userspace/tvflash clean
 	$(MAKE) -C $(SRC)userspace/mstflint clean
@@ -436,7 +455,8 @@ uninstall:
 	-rm -f $(DESTDIR)/$(prefix)/utils/arping
 	-rm -f $(DESTDIR)/$(prefix)/bin/mcasthandle
 	-rm -f $(DESTDIR)/$(prefix)/bin/ipoib_ha.pl
-
+	-rm -f /etc/init.d/ql_vnic
+	-rm -f /usr/local/sbin/vnic_parser.pl
 
 help:
 	@echo
diff --git a/configure b/configure
index 02581b1..7b2a40e 100755
--- a/configure
+++ b/configure
@@ -98,6 +98,9 @@ Usage:  `basename $0` [options]
     --with-ipoibtools  include ipoibtools package [no]
     --without-ipoibtools  don't include ipoibtools package [yes]
     
+    --with-qlvnictools  include qlvnictools package [no]
+    --without-qlvnictools  don't include qlvnictools package [yes]
+
     --with-tvflash  include tvflash package [no]
     --without-tvflash  don't include tvflash package [yes]
     
@@ -403,6 +406,15 @@ main()
                         --without-ipoibtools)
                                 WITH_IPOIBTOOLS="no"
                         ;;
+                        --with-qlvnictools)
+                                WITH_QLVNICTOOLS="yes"
+                                WITH_IBVERBS="yes"
+                                WITH_IBCOMMON="yes"
+                                WITH_IBUMAD="yes"
+                        ;;
+                        --without-qlvnictools)
+                                WITH_QLVNICTOOLS="no"
+                        ;;
                         --with-tvflash)
                                 WITH_TVFLASH="yes"
                         ;;
@@ -436,6 +448,7 @@ main()
                                 WITH_RDMACM="yes"
                                 WITH_SDP="yes"
                                 WITH_SRPTOOLS="yes"
+                                WITH_QLVNICTOOLS="yes"
                                 WITH_TVFLASH="yes"
                         ;;
                         -h | --help)
@@ -480,6 +493,7 @@ WITH_OSM=${WITH_OSM:-"no"}
 WITH_DIAGS=${WITH_DIAGS:-"no"}
 WITH_PERFTEST=${WITH_PERFTEST:-"no"}
 WITH_SRPTOOLS=${WITH_SRPTOOLS:-"no"}
+WITH_QLVNICTOOLS=${WITH_QLVNICTOOLS:-"no"}
 WITH_IPOIBTOOLS=${WITH_IPOIBTOOLS:-"no"}
 WITH_TVFLASH=${WITH_TVFLASH:-"no"}
 WITH_MSTFLINT=${WITH_MSTFLINT:-"no"}
@@ -525,6 +539,7 @@ WITH_DIAGS=${WITH_DIAGS}
 WITH_PERFTEST=${WITH_PERFTEST}
 WITH_SRPTOOLS=${WITH_SRPTOOLS}
 WITH_IPOIBTOOLS=${WITH_IPOIBTOOLS}
+WITH_QLVNICTOOLS=${WITH_QLVNICTOOLS}
 WITH_TVFLASH=${WITH_TVFLASH}
 WITH_MSTFLINT=${WITH_MSTFLINT}
 
@@ -574,6 +589,9 @@ EOFCONFIG
         if [ "${WITH_SRPTOOLS}" == "yes" ]; then
             ullibs="${ullibs} srptools"
         fi
+        if [ "${WITH_QLVNICTOOLS}" == "yes" ]; then
+            ullibs="${ullibs} qlvnictools/ibvexdmtools"
+        fi
         if [ "${WITH_TVFLASH}" == "yes" ]; then
             ullibs="${ullibs} tvflash"
         fi