summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch4
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb1
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index c3e46ce65f..20839b7286 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -22,7 +22,7 @@ index 8c4d2048..e021af32 100644
22 @echo "HTREE=y" >> test_one 22 @echo "HTREE=y" >> test_one
23 @echo "QUOTA=y" >> test_one 23 @echo "QUOTA=y" >> test_one
24- @echo "SRCDIR=@srcdir@" >> test_one 24- @echo "SRCDIR=@srcdir@" >> test_one
25+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one 25+ @echo "SRCDIR=@PTEST_PATH@/test" >> test_one
26 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 26 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
27 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one 27 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
28 @echo "DD=@DD@" >>test_one 28 @echo "DD=@DD@" >>test_one
@@ -31,7 +31,7 @@ index 8c4d2048..e021af32 100644
31 @[ -f test_script ] && chmod u+w test_script || true 31 @[ -f test_script ] && chmod u+w test_script || true
32 @echo "#!/bin/sh" > test_script 32 @echo "#!/bin/sh" > test_script
33- @echo "SRCDIR=@srcdir@" >> test_script 33- @echo "SRCDIR=@srcdir@" >> test_script
34+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script 34+ @echo "SRCDIR=@PTEST_PATH@/test" >> test_script
35 @cat $(srcdir)/test_script.in >> test_script 35 @cat $(srcdir)/test_script.in >> test_script
36 @chmod +x-w test_script 36 @chmod +x-w test_script
37 37
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb
index d3786d6f4c..940b47c155 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb
@@ -133,6 +133,7 @@ do_install_ptest() {
133 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ 133 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
134 -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect* 134 -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
135 sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script 135 sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
136 sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test/test_script ${D}${PTEST_PATH}/test/test_one
136 137
137 # Remove various files 138 # Remove various files
138 find "${D}${PTEST_PATH}" -type f \ 139 find "${D}${PTEST_PATH}" -type f \