1 files changed, 16 insertions, 13 deletions

diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
index 74ae1530cb..909fd77ba2 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,7 +1,7 @@
-From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001
+From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 13 Apr 2017 07:22:23 -0500
-Subject: [PATCH 01/12] RH: fixup udev rules for redhat
+Subject: [PATCH] RH: fixup udev rules for redhat
 
 The multipath rules need to run after scsi_id is run. This means moving
 them after 60-persistent-storage.rules for redhat. Redhat also uses a
@@ -18,17 +18,20 @@ Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
 Upstream-Status: Pending
+
+Rebase to 0.10.0
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile.inc        | 2 +-
- kpartx/kpartx.rules | 2 +-
- multipath/Makefile  | 4 ++--
+ Makefile.inc           | 2 +-
+ kpartx/kpartx.rules.in | 2 +-
+ multipath/Makefile     | 4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 5668e638..de89b21f 100644
+index 729618bd..69521882 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -59,7 +59,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
+@@ -62,7 +62,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
  modulesloaddir := $(systemd_prefix)lib/modules-load.d
  libudevdir     := $(systemd_prefix)lib/udev
  udevrulesdir   := $(libudevdir)/rules.d
@@ -37,16 +40,16 @@ index 5668e638..de89b21f 100644
  mandir         := $(usr_prefix)share/man
  LIB            := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
  syslibdir      := $(prefix)$(LIB)
-diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
-index 1969dee0..d2b28233 100644
---- a/kpartx/kpartx.rules
-+++ b/kpartx/kpartx.rules
+diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
+index 9d879609..2049eb8f 100644
+--- a/kpartx/kpartx.rules.in
++++ b/kpartx/kpartx.rules.in
 @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
  GOTO="kpartx_end"
  
  LABEL="run_kpartx"
--RUN+="/sbin/kpartx -un -p -part /dev/$name"
-+RUN+="/sbin/kpartx -un /dev/$name"
+-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
++RUN+="@BINDIR@/kpartx -un /dev/$name"
  
  LABEL="kpartx_end"
 diff --git a/multipath/Makefile b/multipath/Makefile