iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch

   1 diff --git a/libiscsi/Makefile b/libiscsi/Makefile
   2 index 4aeb44f..a91d6b8 100644
   3 --- a/libiscsi/Makefile
   4 +++ b/libiscsi/Makefile
   5 @@ -3,7 +3,7 @@
   6  OSNAME=$(shell uname -s)
   7  OPTFLAGS ?= -O2 -g
   8  WARNFLAGS ?= -Wall -Wstrict-prototypes
   9 -CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \
  10 +CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
  11                 -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
  12  LIB = libiscsi.so.0
  13  TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
  14 @@ -43,11 +43,10 @@ fw-objs/%.o: ../utils/fwparam_ibft/%.c
  15         $(CC) $(CFLAGS) -c $< -o $@
  16
  17  $(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
  18 -       $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@
  19 +       $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@
  20         ln -s -f $(LIB) libiscsi.so
  21
  22  $(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
  23 -       $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@
  24
  25  html: libiscsi.h libiscsi.doxy
  26         doxygen libiscsi.doxy
  27 diff --git a/usr/Makefile b/usr/Makefile
  28 index 8e505bf..13a60f9 100644
  29 --- a/usr/Makefile
  30 +++ b/usr/Makefile
  31 @@ -31,7 +31,7 @@ endif
  32  OPTFLAGS ?= -O2 -g
  33  WARNFLAGS ?= -Wall -Wstrict-prototypes
  34  CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
  35 -                                       -D$(OSNAME) $(IPC_CFLAGS)
  36 +                                       -D$(OSNAME) $(IPC_CFLAGS) -DISNS_ENABLE
  37  PROGRAMS = iscsid iscsiadm iscsistart
  38
  39  # libc compat files
  40 diff --git a/usr/discovery.c b/usr/discovery.c
  41 index 2233de7..02c6f25 100644
  42 --- a/usr/discovery.c
  43 +++ b/usr/discovery.c
  44 @@ -45,9 +45,11 @@
  45  #include "iscsid_req.h"
  46  #include "iscsi_util.h"
  47  /* libisns includes */
  48 +#ifdef ISNS_ENABLE
  49  #include "isns.h"
  50  #include "paths.h"
  51  #include "message.h"
  52 +#endif
  53
  54  #ifdef SLP_ENABLE
  55  #include "iscsi-slp-discovery.h"
  56 @@ -94,6 +96,7 @@ static int request_initiator_name(void)
  57         return 0;
  58  }
  59
  60 +#ifdef ISNS_ENABLE
  61  void discovery_isns_free_servername(void)
  62  {
  63         if (isns_config.ic_server_name)
  64 @@ -367,6 +370,7 @@ retry:
  65         discovery_isns_free_servername();
  66         return rc;
  67  }
  68 +#endif
  69
  70  int discovery_fw(void *data, struct iface_rec *iface,
  71                  struct list_head *rec_list)
  72 --
  73 1.6.6.1
  74