summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-01-15 15:00:01 +0800
committerKhem Raj <raj.khem@gmail.com>2020-01-15 20:45:09 -0800
commitc8796b02135f23a34c4ca1d682ff67b112c675ef (patch)
treec5ddee1a2de85d03391fce86176ccf7031f12656 /meta-oe/recipes-support
parent45476f9d6a9d7b02a549a19f0e841957a808d3ce (diff)
downloadmeta-openembedded-c8796b02135f23a34c4ca1d682ff67b112c675ef.tar.gz
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@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.3.bb6
1 files changed, 5 insertions, 1 deletions
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 358f0cb60..9e2d86b9a 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} \
73 bindir=${base_sbindir} \ 73 bindir=${base_sbindir} \
74 LIB=${base_libdir} libdir=${base_libdir}/multipath \ 74 LIB=${base_libdir} libdir=${base_libdir}/multipath \
75 unitdir=${systemd_system_unitdir} \ 75 unitdir=${systemd_system_unitdir} \
76 libudevdir=${nonarch_base_libdir}/udev \
76 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ 77 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
77 ' 78 '
78 79
@@ -86,6 +87,9 @@ do_install() {
86 cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd 87 cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd
87 fi 88 fi
88 89
90 sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \
91 ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules
92
89 install -d ${D}${sysconfdir} 93 install -d ${D}${sysconfdir}
90 install -m 0644 ${WORKDIR}/multipath.conf.example \ 94 install -m 0644 ${WORKDIR}/multipath.conf.example \
91 ${D}${sysconfdir}/multipath.conf.example 95 ${D}${sysconfdir}/multipath.conf.example
@@ -106,7 +110,7 @@ FILES_${PN}-dev += "${base_libdir}/pkgconfig"
106 110
107PACKAGES =+ "kpartx" 111PACKAGES =+ "kpartx"
108FILES_kpartx = "${base_sbindir}/kpartx \ 112FILES_kpartx = "${base_sbindir}/kpartx \
109 ${nonarch_libdir}/udev/kpartx_id \ 113 ${nonarch_base_libdir}/udev/kpartx_id \
110 " 114 "
111 115
112RDEPENDS_${PN} += "kpartx" 116RDEPENDS_${PN} += "kpartx"