2b0cd7cceb
Rebased on top of Martin Wilck's queue of ACKed upstream commits * https://github.com/openSUSE/multipath-tools/tree/upstream-queue * All previous patches have been reordered, with the exception of 0011-libdmmp-Add-support-for-upcoming-json-c-0.14.0.patch which has been replaced with 0029-fix-boolean-value-with-json-c-0.14.patch Modify 0054-RH-add-mpathconf.patch * remove default enable_foreign and property blacklist_exceptions settings, and deal with the builtin default change from 0031-libmultipath-set-enable_foreign-to-NONE-by-default.patch. Fixes bz #1853668 Add 0048-Makefile.inc-trim-extra-information-from-systemd-ver.patch Add 0049-kpartx-fix-Wsign-compare-error.patch * The above two patches have been submitted upstream
34 lines
896 B
Diff
34 lines
896 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 11 May 2020 14:24:37 +0200
|
|
Subject: [PATCH] multipath-tools: Makefile: more dependency fixes for parallel
|
|
build
|
|
|
|
Extend the late fixes from Christian.
|
|
|
|
Cc: Christian Hesse <mail@eworm.de>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
Makefile | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index ba1d73ba..fec3b73b 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -28,8 +28,9 @@ all: $(BUILDDIRS)
|
|
$(BUILDDIRS):
|
|
$(MAKE) -C $@
|
|
|
|
-libmpathpersist multipath multipathd mpathpersist: libmultipath
|
|
-mpathpersist: libmpathpersist
|
|
+libmultipath libdmmp: libmpathcmd
|
|
+libmpathpersist multipath multipathd: libmultipath
|
|
+mpathpersist multipathd: libmpathpersist
|
|
|
|
$(BUILDDIRS.clean):
|
|
$(MAKE) -C ${@:.clean=} clean
|
|
--
|
|
2.17.2
|
|
|