b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 22 Sep 2020 12:52:49 +0200
|
|
Subject: [PATCH] multipath-tools Makefiles: separate rules for .so and man
|
|
pages
|
|
|
|
Rely more on "make" functionality than on sequential command execution.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathcmd/Makefile | 8 +++++---
|
|
libmpathpersist/Makefile | 10 +++++++---
|
|
libmultipath/Makefile | 8 +++++---
|
|
3 files changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/libmpathcmd/Makefile b/libmpathcmd/Makefile
|
|
index 0f6b8166..08ccb811 100644
|
|
--- a/libmpathcmd/Makefile
|
|
+++ b/libmpathcmd/Makefile
|
|
@@ -8,13 +8,15 @@ CFLAGS += $(LIB_CFLAGS)
|
|
|
|
OBJS = mpath_cmd.o
|
|
|
|
-all: $(LIBS)
|
|
+all: $(DEVLIB)
|
|
|
|
$(LIBS): $(OBJS)
|
|
$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
|
|
- $(LN) $@ $(DEVLIB)
|
|
|
|
-install: $(LIBS)
|
|
+$(DEVLIB): $(LIBS)
|
|
+ $(LN) $(LIBS) $@
|
|
+
|
|
+install: all
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
|
|
$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
|
|
$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
|
|
diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
|
|
index 21fdad80..9e869fdc 100644
|
|
--- a/libmpathpersist/Makefile
|
|
+++ b/libmpathpersist/Makefile
|
|
@@ -11,15 +11,19 @@ LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \
|
|
|
|
OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
|
|
|
|
-all: $(LIBS)
|
|
+all: $(DEVLIB) man
|
|
|
|
$(LIBS): $(OBJS)
|
|
$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
|
|
- $(LN) $(LIBS) $(DEVLIB)
|
|
+
|
|
+$(DEVLIB): $(LIBS)
|
|
+ $(LN) $(LIBS) $@
|
|
+
|
|
+man:
|
|
$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
|
|
$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
|
|
|
|
-install: $(LIBS)
|
|
+install: all
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
|
|
$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
|
|
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
|
|
diff --git a/libmultipath/Makefile b/libmultipath/Makefile
|
|
index 62ba16e8..40028556 100644
|
|
--- a/libmultipath/Makefile
|
|
+++ b/libmultipath/Makefile
|
|
@@ -54,7 +54,7 @@ OBJS = memory.o parser.o vector.o devmapper.o callout.o \
|
|
io_err_stat.o dm-generic.o generic.o foreign.o nvme-lib.o \
|
|
libsg.o valid.o
|
|
|
|
-all: $(LIBS)
|
|
+all: $(DEVLIB)
|
|
|
|
nvme-lib.o: nvme-lib.c nvme-ioctl.c nvme-ioctl.h
|
|
$(CC) $(CFLAGS) -Wno-unused-function -c -o $@ $<
|
|
@@ -74,9 +74,11 @@ nvme-ioctl.h: nvme/nvme-ioctl.h
|
|
|
|
$(LIBS): $(OBJS)
|
|
$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
|
|
- $(LN) $@ $(DEVLIB)
|
|
|
|
-install:
|
|
+$(DEVLIB): $(LIBS)
|
|
+ $(LN) $(LIBS) $@
|
|
+
|
|
+install: all
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
|
|
$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
|
|
$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
|