From 51361329c89bb66242836b55827786eca5f9d6f9 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Jun 25 2007 18:31:21 +0000 Subject: add iscsistart dynamic compliation patch --- diff --git a/iscsi-initiator-utils-compile-iscsistart-dyn.patch b/iscsi-initiator-utils-compile-iscsistart-dyn.patch new file mode 100644 index 0000000..ac65ba2 --- /dev/null +++ b/iscsi-initiator-utils-compile-iscsistart-dyn.patch @@ -0,0 +1,15 @@ +diff -aurp open-iscsi-2.0-865.2/usr/Makefile open-iscsi-2.0-865.2.dyn/usr/Makefile +--- open-iscsi-2.0-865.2/usr/Makefile 2007-06-21 11:15:17.000000000 -0500 ++++ open-iscsi-2.0-865.2.dyn/usr/Makefile 2007-06-25 13:26:24.000000000 -0500 +@@ -48,9 +48,8 @@ iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INIT + iscsiadm: $(COMMON_SRCS) strings.o discovery.o iscsiadm.o + $(CC) $(CFLAGS) $^ -o $@ + +-iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o \ +- statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o ++ $(CC) $(CFLAGS) $^ -o $@ + + clean: + rm -f *.o $(PROGRAMS) diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 9d153be..4e07f0b 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -7,6 +7,7 @@ Source1: iscsid.init Source2: iscsidevs.init Patch0: iscsi-initiator-utils-update-initscripts-and-docs.patch Patch1: iscsi-initiator-utils-use-var-for-config.patch +Patch2: iscsi-initiator-utils-compile-iscsistart-dyn.patch Group: System Environment/Daemons License: GPL @@ -26,6 +27,7 @@ Protocol networks. %setup -q -n open-iscsi-2.0-865.2 %patch0 -p1 -b .update-initscripts-and-docs %patch1 -p1 -b .use-var-for-config +%patch2 -p1 -b .compile-iscsistart-dyn %build make OPTFLAGS="%{optflags}" -C usr @@ -91,6 +93,7 @@ fi %changelog * Mon Jun 25 2007 Mike Christie - 6.2.0.865-0.1 - Rebase to upstream stable which has a fix for the logoutall command. This will fix the service iscsi stop command. +- 225915 Compile iscsistart as dynamic. * Tue Jun 12 2007 Mike Christie - 6.2.0.865-0.0 - Rebase upstream diff --git a/sources b/sources index 413dad2..4be3715 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ed6c5f4a1b3f01bbd6f40dda26f57eb5 open-iscsi-2.0-865.tar.gz fd3ae8aee6d25fce5c43e2798412829e open-iscsi-2.0-865.2.tar.gz