diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
commit | 9600a7403ba2848c8751280077503a3e0f2f3481 (patch) | |
tree | 996726918f255cc9686dec34628fab410ac8f550 /meta-openembedded/meta-oe/recipes-support/multipath-tools | |
parent | b11bad1ba28f79c08266efb9cc265d89103e5939 (diff) | |
parent | 5ec7af7413906b500cce396255bde69c9770f6d8 (diff) | |
download | openbmc-9600a7403ba2848c8751280077503a3e0f2f3481.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/multipath-tools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb index 358f0cb60..9e2d86b9a 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb +++ b/meta-openembedded/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" |