[oe-commits] [openembedded-core] 62/62: e2fsprogs: fix the hardcoded paths for ptest

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 4a4eff9b9e3c614ff41b17cbec359b72dcbd41bd
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Fri Feb 2 15:10:34 2018 +0800

    e2fsprogs: fix the hardcoded paths for ptest
    
    Fix the hardcoded paths in test scripts and expect
    files to avoid issue like:
    | cat: ../e2fsck/e2fsck: No such file or directory
    
    Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
index a53585d..ceaf171 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
@@ -104,7 +104,9 @@ do_compile_ptest() {
 do_install_ptest() {
 	cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test
 	cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test
-	sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
+	sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
+	    -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
+	sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
 
 	# Remove various files
 	find "${D}${PTEST_PATH}" -type f \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.