diff options
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch')
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch index ac87337694..97425fe9b8 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch @@ -1,4 +1,4 @@ -From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001 +From 51f1f351262a31d94c10504e4d135526c6a7caeb Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Sun, 10 May 2020 21:22:53 +0800 Subject: [PATCH] fix bug of do_compile and do_install @@ -7,27 +7,24 @@ when multiple processes make run in parallel, because of dependency error will occur. Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> + +[OP: Rebase to 0.9.3] +[OP: Drop dependencies that are already present in the 0.9.3 Makefile] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- - Makefile | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) + Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile -index 1dee3680..bea0a0b2 100644 +index 27b4641f..f195b570 100644 --- a/Makefile +++ b/Makefile -@@ -28,9 +28,22 @@ all: $(BUILDDIRS) - $(BUILDDIRS): - $(MAKE) -C $@ - --multipath multipathd mpathpersist: libmultipath -+multipath multipathd mpathpersist libmpathpersist : libmultipath - mpathpersist: libmpathpersist +@@ -79,6 +79,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist +DEPS_ON_MULTIPATH := \ + multipath \ -+ libmultipath/prioritizers \ -+ libmultipath/checkers \ -+ libmultipath/foreign \ + multipathd \ + mpathpersist \ + libmpathpersist @@ -36,9 +33,9 @@ index 1dee3680..bea0a0b2 100644 +mpathpersist.install: libmpathpersist.install +libdmmp.install libmultipath/foreign.install: mpathpersist.install + - $(BUILDDIRS.clean): - $(MAKE) -C ${@:.clean=} clean - + libmultipath/checkers.install \ + libmultipath/prioritizers.install \ + libmultipath/foreign.install: libmultipath.install -- -2.17.1 +2.38.1 |