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 @@ -Index: e2fsprogs-1.42.9/tests/Makefile.in -=================================================================== ---- e2fsprogs-1.42.9.orig/tests/Makefile.in -+++ e2fsprogs-1.42.9/tests/Makefile.in -@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 60cf655..ce220f1 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf @echo "#!/bin/sh" > test_one - @HTREE_CMT@ @echo "HTREE=y" >> test_one - @QUOTA_CMT@ @echo "QUOTA=y" >> test_one + @echo "HTREE=y" >> test_one + @echo "QUOTA=y" >> test_one - @echo "SRCDIR=@srcdir@" >> test_one + @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one @cat $(srcdir)/test_one.in >> test_one @chmod +x test_one -@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile +@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_script: test_one test_script.in Makefile mke2fs.conf @echo "Creating test_script..." @echo "#!/bin/sh" > test_script @@ -20,11 +20,11 @@ Index: e2fsprogs-1.42.9/tests/Makefile.in @cat $(srcdir)/test_script.in >> test_script @chmod +x test_script -Index: e2fsprogs-1.42.9/tests/test_config -=================================================================== ---- e2fsprogs-1.42.9.orig/tests/test_config -+++ e2fsprogs-1.42.9/tests/test_config -@@ -3,23 +3,23 @@ +diff --git a/tests/test_config b/tests/test_config +index 7f39157..c815a44 100644 +--- a/tests/test_config ++++ b/tests/test_config +@@ -3,24 +3,24 @@ # 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 +RESIZE2FS_EXE="/sbin/resize2fs" RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" -E2UNDO_EXE="../misc/e2undo" ++E2UNDO_EXE="/sbin/e2undo" + E2UNDO="$USE_VALGRIND $E2UNDO_EXE" -TEST_REL=../tests/progs/test_rel -TEST_ICOUNT=../tests/progs/test_icount -CRCSUM=../tests/progs/crcsum -+E2UNDO_EXE="/sbin/e2undo" +TEST_REL=./progs/test_rel +TEST_ICOUNT=./progs/test_icount +CRCSUM=./progs/crcsum - LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss - DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss - export LD_LIBRARY_PATH + CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" + LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} + DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} |