summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-11-09 02:21:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-12 16:00:30 +0000
commit442e2e7da5fe5fe7097f8799a479f98d36e60ef3 (patch)
treea9d745cdacf6290406b4dd99eb942eac467eaed1 /meta/recipes-devtools/e2fsprogs
parent1c52c879d282fd58936c252547d150c5e4bf081d (diff)
downloadpoky-442e2e7da5fe5fe7097f8799a479f98d36e60ef3.tar.gz
e2fsprogs: fix tests/f_extent_oobounds
tests/f_extent_oobounds runs debugfs from the system, not from the source tree, and if the system's debugfs doesn't have the extent_open command it fails silently. Use $DEBUGFS and $MKE2FS to get the in-tree executables for this test, just like other test scripts do. (Build machines which run make check shouldn't need to have e2fsprogs installed, and we should be testing just-built versions of the tools anyway) This patch is from: http://www.spinics.net/lists/linux-ext4/msg38880.html Eric Sandeen had sent it to the linux-ext4 mailing list, but haven't been merge by now. [YOCTO #5511] (From OE-Core rev: 22465cef87b4b1685b3b131751eaf528503b264c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch43
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch
new file mode 100644
index 0000000000..a4f7077641
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/e2fsprogs-fix-tests-f_extent_oobounds.patch
@@ -0,0 +1,43 @@
1From 1bfd0e015be7dd22a44995dd2a7002328aedc0e6 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 9 Nov 2013 22:24:37 +0800
4Subject: [PATCH] e2fsprogs: fix tests/f_extent_oobounds
5
6Use $DEBUGFS and $MKE2FS to get the in-tree executables
7for this test.
8
9(Build machines which run make check shouldn't need to have
10e2fsprogs installed, and we should be testing just-built versions
11of the tools anyway)
12
13This patch is from:
14http://www.spinics.net/lists/linux-ext4/msg38880.html
15
16Eric Sandeen had sent it to the upstream, but haven't been merge by now.
17
18Upstream-Status: Backport
19
20Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
21Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
22---
23 tests/f_extent_oobounds/script | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/tests/f_extent_oobounds/script b/tests/f_extent_oobounds/script
27index 31ac6c9..b00b031 100644
28--- a/tests/f_extent_oobounds/script
29+++ b/tests/f_extent_oobounds/script
30@@ -4,8 +4,8 @@ SKIP_GUNZIP="true"
31 TEST_DATA="$test_name.tmp"
32
33 dd if=/dev/zero of=$TMPFILE bs=1k count=256 > /dev/null 2>&1
34-mke2fs -Ft ext4 $TMPFILE > /dev/null 2>&1
35-debugfs -w $TMPFILE << EOF > /dev/null 2>&1
36+$MKE2FS -Ft ext4 $TMPFILE > /dev/null 2>&1
37+$DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
38 write /dev/null testfile
39 extent_open testfile
40 insert_node 0 15 100
41--
421.8.3.1
43
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
index 154b864c12..22ad925fe2 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://acinclude.m4 \
8 file://fix-icache.patch \ 8 file://fix-icache.patch \
9 file://debugfs-extent-header.patch \ 9 file://debugfs-extent-header.patch \
10 file://populate-extfs.sh \ 10 file://populate-extfs.sh \
11 file://e2fsprogs-fix-tests-f_extent_oobounds.patch \
11" 12"
12 13
13SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" 14SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"