Skip to contentSkip to conversation

mdadm: use ${systemd_unitdir} rather than /lib/systemd

PATCH New [email protected] 1 participant 1 message May 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mdadm: use ${systemd_unitdir} rather than /lib/systemd

From: Luca Boccassi <[email protected]>

Fixes build with usrmerge enabled.

---
 meta/recipes-extended/mdadm/mdadm_4.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/mdadm/mdadm_4.1.bb +2 -2
index 597faf787a..40fe376a79 100644
@@ -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}/*"
Signature · 1 line
2.20.1