diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2019-10-29 17:52:30 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-31 16:07:11 +0000 |
| commit | 8eb457bd396592094b59098496d88db0ba03d013 (patch) | |
| tree | 15bfe6a59a0164db29c750f8166c25441c822a95 | |
| parent | 1263db2759b88e423bb717cc0cfc256c7962871b (diff) | |
| download | openembedded-core-contrib-8eb457bd396592094b59098496d88db0ba03d013.tar.gz | |
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@windriver.com>
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.1.bb | 5 |
1 files 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 639382e137..64f519e750 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}" } |