From d8bb36abe8fb9d3d8da2fdbdc7b9ddefce1acc7f Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 24 Feb 2017 10:14:59 +0200 Subject: [PATCH] multipath-tools: Replace 'lib' with ${nonarch_base_libdir} for placing udev rules. Signed-off-by: Amarnath Valluri Signed-off-by: Martin Jansa --- .../recipes-support/multipath-tools/multipath-tools_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb index effd92e4eb..a63982ec27 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb @@ -40,7 +40,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ OPTFLAGS="${CFLAGS}" \ LIB=${base_libdir} libdir=${base_libdir}/multipath \ - unitdir=/lib/systemd/system \ + unitdir=${systemd_system_unitdir} \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ ' @@ -59,11 +59,12 @@ FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" # systemd and udev stuff always goes under /lib! # FILES_${PN} += "${base_libdir}/multipath \ - /lib/systemd" + ${systemd_system_unitdir} \ + " PACKAGES =+ "kpartx" FILES_kpartx = "${base_sbindir}/kpartx \ - /usr/lib/udev/kpartx_id \ + ${nonarch_libdir}/udev/kpartx_id \ " RDEPENDS_${PN} += "kpartx"