[OE-core] [PATCH 2/2] e2fsprogs: fix the hardcoded paths for ptest

jackie.huang at windriver.com jackie.huang at windriver.com
Fri Feb 2 07:10:34 UTC 2018


From: Jackie Huang <jackie.huang at windriver.com>

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>
---
 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 a53585db47..ceaf171585 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 \
-- 
2.11.0




More information about the Openembedded-core mailing list