[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5210/8267] mdadm: Avoid using hardocded sbin path



commit 63b62e5d80e79962ee5d4c9bbd0692664b2cd2de
Author: Amarnath Valluri <amarnath valluri intel com>
Date:   Fri Mar 3 14:27:42 2017 +0200

    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 <amarnath valluri intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/mdadm/mdadm_4.0.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index c228899..62614f0 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}/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]