summaryrefslogtreecommitdiffstats
path: root/meta
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:27 +0100
commitcafbc4bbe128d13c40e104f773cdf85bbd92a87d (patch)
treef3ed5680169735b73b0a01b174fdc989168b5796 /meta
parent0c670a0fad379c3dc2a69ac5abfeaceda98a2f9c (diff)
downloadopenembedded-core-contrib-cafbc4bbe128d13c40e104f773cdf85bbd92a87d.tar.gz
mdadm: use ${systemd_unitdir} rather than /lib/systemd
Fixes build with usrmerge enabled. Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
do_compile() {
# Point to right sbindir
- sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" ${S}/Makefile
+ 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
oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
}
@@ -93,4 +93,4 @@ RRECOMMENDS_${PN}-ptest += " \
kernel-module-raid456 \
"
-FILES_${PN} += "/lib/systemd/*"
+FILES_${PN} += "${systemd_unitdir}/*"