diff options
author | Benjamin Marzinski <bmarzins@redhat.com> | 2013-03-02 17:03:30 -0600 |
---|---|---|
committer | Benjamin Marzinski <bmarzins@redhat.com> | 2013-03-02 17:03:30 -0600 |
commit | d1207a7795f6efc52e321e735a92d7b3d80aaaba (patch) | |
tree | bb53dfc9c74896fe5467159dfb92a4fdf774f492 /0003-RH-Make-build-system-RH-Fedora-friendly.patch | |
parent | 1a1eabcadfe8159ec0373b7a4cf7b2e058ea0db5 (diff) | |
download | device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.gz device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.tar.xz device-mapper-multipath-d1207a7795f6efc52e321e735a92d7b3d80aaaba.zip |
device-mapper-multipath-0.4.9-45
Updated to latest upstrem 0.4.9 code: multipath-tools-130222
(git commit id: 67b82ad6fe280caa1770025a6bb8110b633fa136)
Refresh 0001-RH-dont_start_with_no_config.patch
Modify 0002-RH-multipath.rules.patch
Modify 0003-RH-Make-build-system-RH-Fedora-friendly.patch
Refresh 0004-RH-multipathd-blacklist-all-by-default.patch
Refresh 0005-RH-add-mpathconf.patch
Refresh 0006-RH-add-find-multipaths.patch
Add 0008-RH-revert-partition-changes.patch
Rename 0008-RH-RHEL5-style-partitions.patch to
0009-RH-RHEL5-style-partitions.patch
Rename 0009-RH-dont-remove-map-on-enomem.patch to
0010-RH-dont-remove-map-on-enomem.patch
Rename 0010-RH-deprecate-uid-gid-mode.patch to
0011-RH-deprecate-uid-gid-mode.patch
Rename 0013-RH-kpartx-msg.patch to 0012-RH-kpartx-msg.patch
Rename 0035-RHBZ-883981-cleanup-rpmdiff-issues.patch to
0013-RHBZ-883981-cleanup-rpmdiff-issues.patch
Rename 0039-RH-handle-other-sector-sizes.patch to
0014-RH-handle-other-sector-sizes.patch
Rename 0040-RH-fix-output-buffer.patch to 0015-RH-fix-output-buffer.patch
Add 0016-RH-dont-print-ghost-messages.patch
Add 0017-RH-fix-sigusr1.patch
* Actually this fixes a number of issues related to signals
Rename 0018-RH-remove-config-dups.patch to 0018-RH-fix-factorize.patch
* just the part that isn't upstream
Add 0019-RH-fix-sockets.patch
* makes abstract multipathd a cli sockets use the correct name.
Set find_multipaths in the default config
Diffstat (limited to '0003-RH-Make-build-system-RH-Fedora-friendly.patch')
-rw-r--r-- | 0003-RH-Make-build-system-RH-Fedora-friendly.patch | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/0003-RH-Make-build-system-RH-Fedora-friendly.patch b/0003-RH-Make-build-system-RH-Fedora-friendly.patch index bc5d17d..f293c80 100644 --- a/0003-RH-Make-build-system-RH-Fedora-friendly.patch +++ b/0003-RH-Make-build-system-RH-Fedora-friendly.patch @@ -9,16 +9,16 @@ Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> :100644 100644 21e4ad4... 06d79c0... M kpartx/Makefile :100644 100644 32d9ef5... 25e1483... M multipathd/Makefile Makefile.inc | 2 +- - kpartx/Makefile | 8 ++++---- + kpartx/Makefile | 10 +++++----- libmpathpersist/Makefile | 7 ++----- libmultipath/Makefile | 2 ++ multipathd/Makefile | 1 + - 5 files changed, 10 insertions(+), 10 deletions(-) + 5 files changed, 11 insertions(+), 11 deletions(-) -Index: multipath-tools-120613/Makefile.inc +Index: multipath-tools-130222/Makefile.inc =================================================================== ---- multipath-tools-120613.orig/Makefile.inc -+++ multipath-tools-120613/Makefile.inc +--- multipath-tools-130222.orig/Makefile.inc ++++ multipath-tools-130222/Makefile.inc @@ -29,7 +29,7 @@ multipathdir = $(TOPDIR)/libmultipath mandir = $(prefix)/usr/share/man/man8 man5dir = $(prefix)/usr/share/man/man5 @@ -28,11 +28,11 @@ Index: multipath-tools-120613/Makefile.inc syslibdir = $(prefix)/$(LIB) libdir = $(prefix)/$(LIB)/multipath unitdir = $(prefix)/lib/systemd/system -Index: multipath-tools-120613/kpartx/Makefile +Index: multipath-tools-130222/kpartx/Makefile =================================================================== ---- multipath-tools-120613.orig/kpartx/Makefile -+++ multipath-tools-120613/kpartx/Makefile -@@ -26,10 +26,10 @@ $(EXEC): $(OBJS) +--- multipath-tools-130222.orig/kpartx/Makefile ++++ multipath-tools-130222/kpartx/Makefile +@@ -26,17 +26,17 @@ $(EXEC): $(OBJS) install: $(EXEC) $(EXEC).8 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) @@ -47,10 +47,18 @@ Index: multipath-tools-120613/kpartx/Makefile $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -Index: multipath-tools-120613/multipathd/Makefile + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm -f $(DESTDIR)$(libudevdir)/kpartx_id ++# rm -f $(DESTDIR)$(libudevdir)/kpartx_id + + clean: + rm -f core *.o $(EXEC) *.gz +Index: multipath-tools-130222/multipathd/Makefile =================================================================== ---- multipath-tools-120613.orig/multipathd/Makefile -+++ multipath-tools-120613/multipathd/Makefile +--- multipath-tools-130222.orig/multipathd/Makefile ++++ multipath-tools-130222/multipathd/Makefile @@ -35,6 +35,7 @@ install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) @@ -59,10 +67,10 @@ Index: multipath-tools-120613/multipathd/Makefile $(INSTALL_PROGRAM) -d $(DESTDIR)$(unitdir) $(INSTALL_PROGRAM) -m 644 $(EXEC).service $(DESTDIR)$(unitdir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -Index: multipath-tools-120613/libmultipath/Makefile +Index: multipath-tools-130222/libmultipath/Makefile =================================================================== ---- multipath-tools-120613.orig/libmultipath/Makefile -+++ multipath-tools-120613/libmultipath/Makefile +--- multipath-tools-130222.orig/libmultipath/Makefile ++++ multipath-tools-130222/libmultipath/Makefile @@ -46,9 +46,11 @@ install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) @@ -75,10 +83,10 @@ Index: multipath-tools-120613/libmultipath/Makefile clean: rm -f core *.a *.o *.gz *.so *.so.* -Index: multipath-tools-120613/libmpathpersist/Makefile +Index: multipath-tools-130222/libmpathpersist/Makefile =================================================================== ---- multipath-tools-120613.orig/libmpathpersist/Makefile -+++ multipath-tools-120613/libmpathpersist/Makefile +--- multipath-tools-130222.orig/libmpathpersist/Makefile ++++ multipath-tools-130222/libmpathpersist/Makefile @@ -28,17 +28,14 @@ $(LIBS): install: $(LIBS) $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) |