diff options
| author | Amarnath Valluri <amarnath.valluri@intel.com> | 2017-03-03 14:27:42 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-22 11:35:20 +0000 |
| commit | 63b62e5d80e79962ee5d4c9bbd0692664b2cd2de (patch) | |
| tree | 7beba58c7739e7d4b15afc3cc029c43b002f7618 | |
| parent | 4ef916ba24414c14b2290d36a05b18774304a85b (diff) | |
| download | poky-63b62e5d80e79962ee5d4c9bbd0692664b2cd2de.tar.gz | |
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>
| -rw-r--r-- | 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 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__' | |||
| 33 | CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' | 33 | CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' |
| 34 | 34 | ||
| 35 | do_compile() { | 35 | do_compile() { |
| 36 | # Point to right sbindir | ||
| 37 | sed -i -e "s;BINDIR = /sbin;BINDIR = $base_sbindir;" ${S}/Makefile | ||
| 36 | oe_runmake SYSROOT="${STAGING_DIR_TARGET}" | 38 | oe_runmake SYSROOT="${STAGING_DIR_TARGET}" |
| 37 | } | 39 | } |
| 38 | 40 | ||
| @@ -51,7 +53,7 @@ do_install_ptest() { | |||
| 51 | cp -a ${S}/tests ${D}${PTEST_PATH}/tests | 53 | cp -a ${S}/tests ${D}${PTEST_PATH}/tests |
| 52 | cp ${S}/test ${D}${PTEST_PATH} | 54 | cp ${S}/test ${D}${PTEST_PATH} |
| 53 | sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test | 55 | sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test |
| 54 | ln -s /sbin/mdadm ${D}${PTEST_PATH}/mdadm | 56 | ln -s ${base_sbindir}/mdadm ${D}${PTEST_PATH}/mdadm |
| 55 | for prg in test_stripe swap_super raid6check | 57 | for prg in test_stripe swap_super raid6check |
| 56 | do | 58 | do |
| 57 | install -D -m 755 $prg ${D}${PTEST_PATH}/ | 59 | install -D -m 755 $prg ${D}${PTEST_PATH}/ |
