summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2019-05-24 16:24:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-27 17:06:34 +0100
commit613224104ae0c8fea8d124dc2a0e47a3f9971a76 (patch)
tree6f8316a35ce71480cbc1ead0ccbe810ab6fc5b3f /meta/recipes-extended
parent1e1e6c080345bb8bc45e769b6d3d7cc4cdd452d9 (diff)
downloadpoky-613224104ae0c8fea8d124dc2a0e47a3f9971a76.tar.gz
mdadm: use ${systemd_unitdir} rather than /lib/systemd
Fixes build with usrmerge enabled. (From OE-Core rev: cafbc4bbe128d13c40e104f773cdf85bbd92a87d) Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 597faf787a..40fe376a79 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -45,7 +45,7 @@ DEBUG_OPTIMIZATION_append = " -Wno-error"
45 45
46do_compile() { 46do_compile() {
47 # Point to right sbindir 47 # Point to right sbindir
48 sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" ${S}/Makefile 48 sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" -e "s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;" ${S}/Makefile
49 oe_runmake SYSROOT="${STAGING_DIR_TARGET}" 49 oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
50} 50}
51 51
@@ -93,4 +93,4 @@ RRECOMMENDS_${PN}-ptest += " \
93 kernel-module-raid456 \ 93 kernel-module-raid456 \
94" 94"
95 95
96FILES_${PN} += "/lib/systemd/*" 96FILES_${PN} += "${systemd_unitdir}/*"