diff options
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index b8a53e9133..ef1ce5872a 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | |||
@@ -1,17 +1,17 @@ | |||
1 | Index: e2fsprogs-1.42.9/tests/Makefile.in | 1 | diff --git a/tests/Makefile.in b/tests/Makefile.in |
2 | =================================================================== | 2 | index 60cf655..ce220f1 100644 |
3 | --- e2fsprogs-1.42.9.orig/tests/Makefile.in | 3 | --- a/tests/Makefile.in |
4 | +++ e2fsprogs-1.42.9/tests/Makefile.in | 4 | +++ b/tests/Makefile.in |
5 | @@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile | 5 | @@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf |
6 | @echo "#!/bin/sh" > test_one | 6 | @echo "#!/bin/sh" > test_one |
7 | @HTREE_CMT@ @echo "HTREE=y" >> test_one | 7 | @echo "HTREE=y" >> test_one |
8 | @QUOTA_CMT@ @echo "QUOTA=y" >> test_one | 8 | @echo "QUOTA=y" >> test_one |
9 | - @echo "SRCDIR=@srcdir@" >> test_one | 9 | - @echo "SRCDIR=@srcdir@" >> test_one |
10 | + @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one | 10 | + @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one |
11 | @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one | 11 | @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one |
12 | @cat $(srcdir)/test_one.in >> test_one | 12 | @cat $(srcdir)/test_one.in >> test_one |
13 | @chmod +x test_one | 13 | @chmod +x test_one |
14 | @@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile | 14 | @@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf |
15 | test_script: test_one test_script.in Makefile mke2fs.conf | 15 | test_script: test_one test_script.in Makefile mke2fs.conf |
16 | @echo "Creating test_script..." | 16 | @echo "Creating test_script..." |
17 | @echo "#!/bin/sh" > test_script | 17 | @echo "#!/bin/sh" > test_script |
@@ -20,11 +20,11 @@ Index: e2fsprogs-1.42.9/tests/Makefile.in | |||
20 | @cat $(srcdir)/test_script.in >> test_script | 20 | @cat $(srcdir)/test_script.in >> test_script |
21 | @chmod +x test_script | 21 | @chmod +x test_script |
22 | 22 | ||
23 | Index: e2fsprogs-1.42.9/tests/test_config | 23 | diff --git a/tests/test_config b/tests/test_config |
24 | =================================================================== | 24 | index 7f39157..c815a44 100644 |
25 | --- e2fsprogs-1.42.9.orig/tests/test_config | 25 | --- a/tests/test_config |
26 | +++ e2fsprogs-1.42.9/tests/test_config | 26 | +++ b/tests/test_config |
27 | @@ -3,23 +3,23 @@ | 27 | @@ -3,24 +3,24 @@ |
28 | # | 28 | # |
29 | 29 | ||
30 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER | 30 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER |
@@ -54,13 +54,14 @@ Index: e2fsprogs-1.42.9/tests/test_config | |||
54 | +RESIZE2FS_EXE="/sbin/resize2fs" | 54 | +RESIZE2FS_EXE="/sbin/resize2fs" |
55 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" | 55 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" |
56 | -E2UNDO_EXE="../misc/e2undo" | 56 | -E2UNDO_EXE="../misc/e2undo" |
57 | +E2UNDO_EXE="/sbin/e2undo" | ||
58 | E2UNDO="$USE_VALGRIND $E2UNDO_EXE" | ||
57 | -TEST_REL=../tests/progs/test_rel | 59 | -TEST_REL=../tests/progs/test_rel |
58 | -TEST_ICOUNT=../tests/progs/test_icount | 60 | -TEST_ICOUNT=../tests/progs/test_icount |
59 | -CRCSUM=../tests/progs/crcsum | 61 | -CRCSUM=../tests/progs/crcsum |
60 | +E2UNDO_EXE="/sbin/e2undo" | ||
61 | +TEST_REL=./progs/test_rel | 62 | +TEST_REL=./progs/test_rel |
62 | +TEST_ICOUNT=./progs/test_icount | 63 | +TEST_ICOUNT=./progs/test_icount |
63 | +CRCSUM=./progs/crcsum | 64 | +CRCSUM=./progs/crcsum |
64 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss | 65 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" |
65 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss | 66 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} |
66 | export LD_LIBRARY_PATH | 67 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} |