From 613224104ae0c8fea8d124dc2a0e47a3f9971a76 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 24 May 2019 16:24:26 +0100 Subject: mdadm: use ${systemd_unitdir} rather than /lib/systemd Fixes build with usrmerge enabled. (From OE-Core rev: cafbc4bbe128d13c40e104f773cdf85bbd92a87d) Signed-off-by: Luca Boccassi Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/mdadm_4.1.bb | 4 ++-- 1 file 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}/*" -- cgit v1.2.3-54-g00ecf