[oe-commits] [openembedded-core] 15/31: mdadm: fix do_package failed when changed local.conf but not cleaned

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch zeus
in repository openembedded-core.

commit d0f285bd7d066e752b93e57b7f5468819016586f
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Tue Oct 29 17:52:30 2019 +0800

    mdadm: fix do_package failed when changed local.conf but not cleaned
    
    reproduce steps:
    1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
    2. bitbake mdadm --success
    3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
    4. bitbake mdadm  -- failed when do_package
    
    it is not proper to change source Makefile during do_install by sed,
    fix by pass correct config to EXTRA_OEMAKE
    
    [YOCTO #13493]
    
    Signed-off-by: Changqing Li <changqing.li at windriver.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-extended/mdadm/mdadm_4.1.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 639382e..64f519e 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -43,13 +43,12 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
 CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
 CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
 
-EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
+EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_unitdir}/system \
+                BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"'
 
 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;" -e "s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;" ${S}/Makefile
 	oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.