- Update to version 0.4.9
- Merge in latest changes from mainline OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=31
This commit is contained in:
parent
212398378e
commit
dc4b6848bc
@ -1,64 +0,0 @@
|
||||
--- multipathd/Makefile.orig
|
||||
+++ multipathd/Makefile
|
||||
@@ -5,8 +5,8 @@ include ../Makefile.inc
|
||||
#
|
||||
# basic flags setting
|
||||
#
|
||||
-CFLAGS += -I$(multipathdir)
|
||||
-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
|
||||
+CFLAGS += -pthread -I$(multipathdir)
|
||||
+LDFLAGS += -ldevmapper -lreadline -lncurses -ldl \
|
||||
-lmultipath -L$(multipathdir)
|
||||
|
||||
#
|
||||
@@ -28,7 +28,7 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt.
|
||||
all : $(EXEC)
|
||||
|
||||
$(EXEC): $(OBJS)
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
|
||||
+ $(CC) $(CFLAGS) -o $(EXEC) $(OBJS) $(LDFLAGS)
|
||||
|
||||
install:
|
||||
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
|
||||
--- multipath/Makefile.orig
|
||||
+++ multipath/Makefile
|
||||
@@ -6,8 +6,8 @@ include ../Makefile.inc
|
||||
|
||||
OBJS = main.o
|
||||
|
||||
-CFLAGS += -I$(multipathdir)
|
||||
-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
|
||||
+CFLAGS += -pthread -I$(multipathdir)
|
||||
+LDFLAGS += -ldevmapper -ldl -lmultipath -L$(multipathdir)
|
||||
|
||||
EXEC = multipath
|
||||
|
||||
--- libmultipath/Makefile.orig
|
||||
+++ libmultipath/Makefile
|
||||
@@ -7,7 +7,7 @@ include ../Makefile.inc
|
||||
SONAME=0
|
||||
DEVLIB = libmultipath.so
|
||||
LIBS = $(DEVLIB).$(SONAME)
|
||||
-LIBDEPS = -lpthread -ldl -ldevmapper
|
||||
+LIBDEPS = -ldl -ldevmapper
|
||||
|
||||
OBJS = memory.o parser.o vector.o devmapper.o callout.o \
|
||||
hwtable.o blacklist.o util.o dmparser.o config.o \
|
||||
@@ -19,7 +19,7 @@ OBJS = memory.o parser.o vector.o devmap
|
||||
|
||||
LIBDM_API_FLUSH = $(shell objdump -T ${LIB}/libdevmapper.so.* ; fi | grep -c dm_task_no_flush)
|
||||
|
||||
-CFLAGS += -D_GNU_SOURCE
|
||||
+CFLAGS += -pthread -D_GNU_SOURCE
|
||||
ifneq ($(strip $(LIBDM_API_FLUSH)),0)
|
||||
CFLAGS += -DLIBDM_API_FLUSH
|
||||
endif
|
||||
@@ -27,7 +27,7 @@ endif
|
||||
all: $(LIBS)
|
||||
|
||||
$(LIBS): $(OBJS)
|
||||
- $(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
|
||||
+ $(CC) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
|
||||
ln -sf $@ $(DEVLIB)
|
||||
|
||||
install:
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:509f32328ea4bb172eba24c5be8c7f867c700d0b3e49d843adadabf1ffa39651
|
||||
size 143592
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b76d93d244f51e328969203366939d4336c89bd572e275d6a0d50d0bc8b4cd23
|
||||
size 160706
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3cd90ece4687e2415fef776b17bf4f86a8dabd7e8456238cf359eb18e2fc4357
|
||||
size 111240
|
||||
oid sha256:aa89bdebfe991be0add95b90e8e84dc0bed2ad259b96f3e61e2ce8d574614ffd
|
||||
size 111263
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 30 17:32:10 CEST 2012 - hare@suse.de
|
||||
|
||||
- Update to version 0.4.9
|
||||
- Merge in latest changes from mainline
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 20 08:35:06 UTC 2012 - rmilasan@suse.com
|
||||
|
||||
|
@ -79,8 +79,8 @@ make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install
|
||||
mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
|
||||
rm /usr/include/mpath_persist.h
|
||||
rm /%_lib/libmpathpersist.so
|
||||
rm $RPM_BUILD_ROOT/usr/include/mpath_persist.h
|
||||
rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
|
||||
|
||||
%clean
|
||||
[ "$RPM_BUILD_ROOT" != / ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
|
||||
@ -148,6 +148,8 @@ fi
|
||||
%{_mandir}/man8/multipath.8*
|
||||
%{_mandir}/man5/multipath.conf.5*
|
||||
%{_mandir}/man8/multipathd.8*
|
||||
%{_mandir}/man8/mpathpersist.8*
|
||||
%{_mandir}/man3/mpath_persistent_*
|
||||
|
||||
%files -n kpartx
|
||||
%defattr(-,root,root)
|
||||
|
Loading…
Reference in New Issue
Block a user