From 63b62e5d80e79962ee5d4c9bbd0692664b2cd2de Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 3 Mar 2017 14:27:42 +0200 Subject: mdadm: Avoid using hardocded sbin path Use appropriate bitbake variable inplace of hardcoded sbin path in Makefile (From OE-Core rev: 9e01148176341916b1fcfebe46d70b75b42777d5) Signed-off-by: Amarnath Valluri Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/mdadm_4.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb index c2288995ba..62614f060f 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.0.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb @@ -33,6 +33,8 @@ CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' do_compile() { + # Point to right sbindir + sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" ${S}/Makefile oe_runmake SYSROOT="${STAGING_DIR_TARGET}" } @@ -51,7 +53,7 @@ do_install_ptest() { cp -a ${S}/tests ${D}${PTEST_PATH}/tests cp ${S}/test ${D}${PTEST_PATH} sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test - ln -s /sbin/mdadm ${D}${PTEST_PATH}/mdadm + ln -s ${base_sbindir}/mdadm ${D}${PTEST_PATH}/mdadm for prg in test_stripe swap_super raid6check do install -D -m 755 $prg ${D}${PTEST_PATH}/ -- cgit v1.2.3-54-g00ecf