From: Jackie Huang Date: Fri, 2 Feb 2018 07:10:34 +0000 (+0800) Subject: e2fsprogs: fix the hardcoded paths for ptest X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~18843 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a4eff9b9e3c614ff41b17cbec359b72dcbd41bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index a53585db470..ceaf1715854 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 \