]> code.ossystems Code Review - openembedded-core.git/commitdiff
mdadm: Avoid using hardocded sbin path
authorAmarnath Valluri <amarnath.valluri@intel.com>
Fri, 3 Mar 2017 12:27:42 +0000 (14:27 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 21 Mar 2017 22:43:01 +0000 (22:43 +0000)
Use appropriate bitbake variable inplace of hardcoded sbin path in Makefile

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-extended/mdadm/mdadm_4.0.bb

index c2288995ba2062a48f60a138f95bc2cc06bcd4e4..62614f060f2f7e4a5e708a6ac4476d5d7ca4797f 100644 (file)
@@ -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}/