summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-10-29 17:52:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-31 16:09:35 +0000
commitf4a337e472884fd8e35355a861b8acb5649fea93 (patch)
treeb6ef6bca4672ff4a37e0b1073b6550019c2d5cfe /meta
parent3a1ad58f74a9c6ad5bccc5832de9dd3e03be2d36 (diff)
downloadpoky-f4a337e472884fd8e35355a861b8acb5649fea93.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] (From OE-Core rev: 8eb457bd396592094b59098496d88db0ba03d013) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb5
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__'
43CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' 43CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
44CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' 44CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
45 45
46EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"' 46EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_unitdir}/system \
47 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"'
47 48
48DEBUG_OPTIMIZATION_append = " -Wno-error" 49DEBUG_OPTIMIZATION_append = " -Wno-error"
49 50
50do_compile() { 51do_compile() {
51 # Point to right sbindir
52 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
53 oe_runmake SYSROOT="${STAGING_DIR_TARGET}" 52 oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
54} 53}
55 54