summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-08-01 16:14:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-02 09:30:11 +0100
commit6954a0f55a1262af05a0bcf17d4eb0e96254deb1 (patch)
treee2ffc0bc98f2e89c463c5ead7f6f2a89aea1981e
parent4fa55a22ca5d1e0f5dbcce402f1d3ef2078d013b (diff)
downloadpoky-6954a0f55a1262af05a0bcf17d4eb0e96254deb1.tar.gz
e2fsprogs: 1.44.2 -> 1.44.3
Rebased ptest.patch. (From OE-Core rev: 59dfd8246358f32bc5e43fc845c0c685aa4cd428) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch49
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb)2
2 files changed, 29 insertions, 22 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index 7c4bb39fd7..64a791dfab 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Inappropriate 1Upstream-Status: Inappropriate
2 2
3Index: git/tests/Makefile.in 3diff --git a/tests/Makefile.in b/tests/Makefile.in
4=================================================================== 4index 8c4d204..e021af3 100644
5--- git.orig/tests/Makefile.in 5--- a/tests/Makefile.in
6+++ git/tests/Makefile.in 6+++ b/tests/Makefile.in
7@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile 7@@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
8 @echo "#!/bin/sh" > test_one 8 @echo "#!/bin/sh" > test_one
9 @echo "HTREE=y" >> test_one 9 @echo "HTREE=y" >> test_one
10 @echo "QUOTA=y" >> test_one 10 @echo "QUOTA=y" >> test_one
@@ -13,20 +13,20 @@ Index: git/tests/Makefile.in
13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
14 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one 14 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
15 @echo "DD=@DD@" >>test_one 15 @echo "DD=@DD@" >>test_one
16@@ -28,7 +28,7 @@ test_one: $(srcdir)/test_one.in Makefile 16@@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf
17 test_script: test_one test_script.in Makefile mke2fs.conf
18 @echo "Creating test_script..." 17 @echo "Creating test_script..."
18 @[ -f test_script ] && chmod u+w test_script || true
19 @echo "#!/bin/sh" > test_script 19 @echo "#!/bin/sh" > test_script
20- @echo "SRCDIR=@srcdir@" >> test_script 20- @echo "SRCDIR=@srcdir@" >> test_script
21+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script 21+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script
22 @cat $(srcdir)/test_script.in >> test_script 22 @cat $(srcdir)/test_script.in >> test_script
23 @chmod +x test_script 23 @chmod +x-w test_script
24 24
25Index: git/tests/test_config 25diff --git a/tests/test_config b/tests/test_config
26=================================================================== 26index 1f146ca..52c453f 100644
27--- git.orig/tests/test_config 27--- a/tests/test_config
28+++ git/tests/test_config 28+++ b/tests/test_config
29@@ -3,24 +3,24 @@ 29@@ -3,16 +3,16 @@
30 # 30 #
31 31
32 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 32 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
@@ -40,8 +40,6 @@ Index: git/tests/test_config
40-E2IMAGE_EXE="../misc/e2image" 40-E2IMAGE_EXE="../misc/e2image"
41-DEBUGFS="$USE_VALGRIND ../debugfs/debugfs" 41-DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
42-DEBUGFS_EXE="../debugfs/debugfs" 42-DEBUGFS_EXE="../debugfs/debugfs"
43-TEST_BITS="../debugfs/debugfs"
44-RESIZE2FS_EXE="../resize/resize2fs"
45+FSCK="$USE_VALGRIND e2fsck" 43+FSCK="$USE_VALGRIND e2fsck"
46+MKE2FS="$USE_VALGRIND mke2fs" 44+MKE2FS="$USE_VALGRIND mke2fs"
47+DUMPE2FS="$USE_VALGRIND dumpe2fs" 45+DUMPE2FS="$USE_VALGRIND dumpe2fs"
@@ -49,28 +47,37 @@ Index: git/tests/test_config
49+CHATTR="$USE_VALGRIND chattr" 47+CHATTR="$USE_VALGRIND chattr"
50+LSATTR="$USE_VALGRIND lsattr" 48+LSATTR="$USE_VALGRIND lsattr"
51+E2IMAGE="$USE_VALGRIND e2image" 49+E2IMAGE="$USE_VALGRIND e2image"
52+E2IMAGE_EXE="/sbin/e2image" 50+E2IMAGE_EXE=/sbin/e2image"
53+DEBUGFS="$USE_VALGRIND debugfs" 51+DEBUGFS="$USE_VALGRIND debugfs"
54+DEBUGFS_EXE="/sbin/debugfs" 52+DEBUGFS_EXE="/sbin/debugfs"
55+TEST_BITS="/sbin/debugfs" 53 TEST_BITS="test_data.tmp"
54 if [ ! -s $TEST_BITS ]; then
55 # create a non-sparse test file if possible, since debugfs may be
56@@ -21,14 +21,14 @@ if [ ! -s $TEST_BITS ]; then
57 dd if=/dev/urandom of=$TEST_BITS bs=128k count=1 > /dev/null 2>&1 ||
58 TEST_BITS="$DEFBUGFS_EXE"
59 fi
60-RESIZE2FS_EXE="../resize/resize2fs"
56+RESIZE2FS_EXE="/sbin/resize2fs" 61+RESIZE2FS_EXE="/sbin/resize2fs"
57 RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" 62 RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"
58-E2UNDO_EXE="../misc/e2undo" 63-E2UNDO_EXE="../misc/e2undo"
59+E2UNDO_EXE="/sbin/e2undo" 64+E2UNDO_EXE="/sbin/e2undo"
60 E2UNDO="$USE_VALGRIND $E2UNDO_EXE" 65 E2UNDO="$USE_VALGRIND $E2UNDO_EXE"
66-E2MMPSTATUS="$USE_VALGRIND ../misc/dumpe2fs -m"
61-TEST_REL=../tests/progs/test_rel 67-TEST_REL=../tests/progs/test_rel
62-TEST_ICOUNT=../tests/progs/test_icount 68-TEST_ICOUNT=../tests/progs/test_icount
63-CRCSUM=../tests/progs/crcsum 69-CRCSUM=../tests/progs/crcsum
70+E2MMPSTATUS="$USE_VALGRIND dumpe2fs -m"
64+TEST_REL=./progs/test_rel 71+TEST_REL=./progs/test_rel
65+TEST_ICOUNT=./progs/test_icount 72+TEST_ICOUNT=./progs/test_icount
66+CRCSUM=./progs/crcsum 73+CRCSUM=./progs/crcsum
67 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" 74 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
68 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} 75 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
69 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} 76 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}
70Index: git/tests/test_script.in 77diff --git a/tests/test_script.in b/tests/test_script.in
71=================================================================== 78index 9959e30..442999d 100644
72--- git.orig/tests/test_script.in 79--- a/tests/test_script.in
73+++ git/tests/test_script.in 80+++ b/tests/test_script.in
74@@ -39,7 +39,7 @@ for i; do 81@@ -39,7 +39,7 @@ for i; do
75 done 82 done
76 83
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb
index f2537a554e..d7391ee6df 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb
@@ -12,7 +12,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio
12 file://quiet-debugfs.patch \ 12 file://quiet-debugfs.patch \
13" 13"
14 14
15SRCREV = "7b9ea51db3be8972c7a17de25be179b18fc9fcde" 15SRCREV = "85e53f42f98d5334914de01e972e9ed44bccd0a5"
16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
17 17
18EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 18EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \