[oe-commits] [meta-openembedded] 01/26: multipath-tools: fix libudevdir

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit c8796b02135f23a34c4ca1d682ff67b112c675ef
Author: Yi Zhao <yi.zhao at windriver.com>
AuthorDate: Wed Jan 15 15:00:01 2020 +0800

    multipath-tools: fix libudevdir
    
    Specify libudevdir explicitly because it is expanded to /usr/lib/udev
    rather than /lib/udev by default.
    
    Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb
index 358f0cb..9e2d86b 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb
@@ -73,6 +73,7 @@ EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
                 bindir=${base_sbindir} \
                 LIB=${base_libdir} libdir=${base_libdir}/multipath \
                 unitdir=${systemd_system_unitdir} \
+                libudevdir=${nonarch_base_libdir}/udev \
                 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
                '
 
@@ -86,6 +87,9 @@ do_install() {
         cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd
     fi
 
+    sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \
+        ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules
+
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/multipath.conf.example \
     ${D}${sysconfdir}/multipath.conf.example
@@ -106,7 +110,7 @@ FILES_${PN}-dev += "${base_libdir}/pkgconfig"
 
 PACKAGES =+ "kpartx"
 FILES_kpartx = "${base_sbindir}/kpartx \
-                ${nonarch_libdir}/udev/kpartx_id \
+                ${nonarch_base_libdir}/udev/kpartx_id \
                "
 
 RDEPENDS_${PN} += "kpartx"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.