From 4b2c86ff0031effd4cfdb477f67bc213d39ae0fd Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 17 Aug 2018 14:27:09 +0800 Subject: mdadm: fix usrmerge install path Update /lib to $nonarch_base_libdir to fix the below error when usrmerge enabled in DISTRO_FEATURES. ERROR: mdadm-4.0-r0 do_package_qa: QA Issue: mdadm package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/mdadm_4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb index 226b974352..2c4d88a9e7 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.0.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb @@ -42,7 +42,7 @@ CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' do_compile() { # Point to right sbindir - sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" ${S}/Makefile + sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" ${S}/Makefile oe_runmake SYSROOT="${STAGING_DIR_TARGET}" } -- cgit 1.2.3-korg