summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-08-21 01:00:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-23 08:47:02 +0100
commit08975348f19428c7bb39d497a7d738f90b25ae7b (patch)
tree70be7f5ad5ed9dcf63796f5c77cd57f3893e69a9 /meta/recipes-devtools/e2fsprogs
parent7fa9b8f91f78d5eecbfee31f71294805209f3e5b (diff)
downloadpoky-08975348f19428c7bb39d497a7d738f90b25ae7b.tar.gz
e2fsprogs: 1.43.4 -> 1.43.5
Removed the following 2 patches which are already in the source: - 0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch - e2fsprogs-1.43-sysmacros.patch (From OE-Core rev: ce0efa2e38611428aff6d39d52ce29f8a6571813) 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/0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch255
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch130
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb)4
3 files changed, 1 insertions, 388 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch
deleted file mode 100644
index 1d17520252..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch
+++ /dev/null
@@ -1,255 +0,0 @@
1From bf9f3b6d5b10d19218b4ed904c12b22e36ec57dd Mon Sep 17 00:00:00 2001
2From: Theodore Ts'o <tytso@mit.edu>
3Date: Thu, 16 Feb 2017 22:02:35 -0500
4Subject: [PATCH] e2fsck: exit with exit status 0 if no errors were fixed
5
6Previously, e2fsck would exit with a status code of 1 even though the
7only changes that it made to the file system were various
8optimziations and not fixing file system corruption. Since the man
9page states that an exit status of 1 means "file system errors
10corrupted", fix e2fsck to return an exit status of 0.
11
12Upstream-Status: Backport
13
14Signed-off-by: Theodore Ts'o <tytso@mit.edu>
15Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
16---
17 e2fsck/e2fsck.conf.5.in | 7 +++++++
18 e2fsck/journal.c | 1 +
19 e2fsck/problem.c | 8 +++++---
20 e2fsck/problemP.h | 1 +
21 e2fsck/unix.c | 20 ++++++++++++++++----
22 tests/f_collapse_extent_tree/expect.1 | 2 +-
23 tests/f_compress_extent_tree_level/expect.1 | 2 +-
24 tests/f_convert_bmap/expect.1 | 2 +-
25 tests/f_convert_bmap_and_extent/expect.1 | 2 +-
26 tests/f_extent_htree/expect.1 | 2 +-
27 tests/f_jnl_errno/expect.1 | 2 +-
28 tests/f_journal/expect.1 | 2 +-
29 tests/f_orphan/expect.1 | 2 +-
30 tests/f_orphan_extents_inode/expect.1 | 2 +-
31 tests/f_rehash_dir/expect.1 | 2 +-
32 tests/f_unsorted_EAs/expect.1 | 2 +-
33 16 files changed, 41 insertions(+), 18 deletions(-)
34
35diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in
36index 1848bdb..0bfc76a 100644
37--- a/e2fsck/e2fsck.conf.5.in
38+++ b/e2fsck/e2fsck.conf.5.in
39@@ -303,6 +303,13 @@ of 'should this problem be fixed?'. The
40 option even overrides the
41 .B -y
42 option given on the command-line (just for the specific problem, of course).
43+.TP
44+.I not_a_fix
45+This boolean option, it set to true, marks the problem as
46+one where if the user gives permission to make the requested change,
47+it does not mean that the file system had a problem which has since
48+been fixed. This is used for requests to optimize the file system's
49+data structure, such as pruning an extent tree.
50 @TDB_MAN_COMMENT@.SH THE [scratch_files] STANZA
51 @TDB_MAN_COMMENT@The following relations are defined in the
52 @TDB_MAN_COMMENT@.I [scratch_files]
53diff --git a/e2fsck/journal.c b/e2fsck/journal.c
54index 46fe7b4..c4f58f1 100644
55--- a/e2fsck/journal.c
56+++ b/e2fsck/journal.c
57@@ -572,6 +572,7 @@ static void clear_v2_journal_fields(journal_t *journal)
58 if (!fix_problem(ctx, PR_0_CLEAR_V2_JOURNAL, &pctx))
59 return;
60
61+ ctx->flags |= E2F_FLAG_PROBLEMS_FIXED;
62 memset(((char *) journal->j_superblock) + V1_SB_SIZE, 0,
63 ctx->fs->blocksize-V1_SB_SIZE);
64 mark_buffer_dirty(journal->j_sb_buffer);
65diff --git a/e2fsck/problem.c b/e2fsck/problem.c
66index 34a671e..4b25069 100644
67--- a/e2fsck/problem.c
68+++ b/e2fsck/problem.c
69@@ -1276,12 +1276,12 @@ static struct e2fsck_problem problem_table[] = {
70 /* Inode extent tree could be shorter */
71 { PR_1E_CAN_COLLAPSE_EXTENT_TREE,
72 N_("@i %i @x tree (at level %b) could be shorter. "),
73- PROMPT_FIX, PR_NO_OK | PR_PREEN_NO | PR_PREEN_OK },
74+ PROMPT_FIX, PR_NO_OK | PR_PREEN_NO | PR_PREEN_OK | PR_NOT_A_FIX },
75
76 /* Inode extent tree could be narrower */
77 { PR_1E_CAN_NARROW_EXTENT_TREE,
78 N_("@i %i @x tree (at level %b) could be narrower. "),
79- PROMPT_FIX, PR_NO_OK | PR_PREEN_NO | PR_PREEN_OK },
80+ PROMPT_FIX, PR_NO_OK | PR_PREEN_NO | PR_PREEN_OK | PR_NOT_A_FIX },
81
82 /* Pass 2 errors */
83
84@@ -2166,6 +2166,7 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
85 reconfigure_bool(ctx, ptr, key, PR_NO_NOMSG, "no_nomsg");
86 reconfigure_bool(ctx, ptr, key, PR_PREEN_NOHDR, "preen_noheader");
87 reconfigure_bool(ctx, ptr, key, PR_FORCE_NO, "force_no");
88+ reconfigure_bool(ctx, ptr, key, PR_NOT_A_FIX, "not_a_fix");
89 profile_get_integer(ctx->profile, "options",
90 "max_count_problems", 0, 0,
91 &ptr->max_count);
92@@ -2283,7 +2284,8 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
93 if (ptr->flags & PR_AFTER_CODE)
94 answer = fix_problem(ctx, ptr->second_code, pctx);
95
96- if (answer && (ptr->prompt != PROMPT_NONE))
97+ if (answer && (ptr->prompt != PROMPT_NONE) &&
98+ !(ptr->flags & PR_NOT_A_FIX))
99 ctx->flags |= E2F_FLAG_PROBLEMS_FIXED;
100
101 return answer;
102diff --git a/e2fsck/problemP.h b/e2fsck/problemP.h
103index 7944cd6..63bb8df 100644
104--- a/e2fsck/problemP.h
105+++ b/e2fsck/problemP.h
106@@ -44,3 +44,4 @@ struct latch_descr {
107 #define PR_CONFIG 0x080000 /* This problem has been customized
108 from the config file */
109 #define PR_FORCE_NO 0x100000 /* Force the answer to be no */
110+#define PR_NOT_A_FIX 0x200000 /* Yes doesn't mean a problem was fixed */
111diff --git a/e2fsck/unix.c b/e2fsck/unix.c
112index eb9f311..9e4d31a 100644
113--- a/e2fsck/unix.c
114+++ b/e2fsck/unix.c
115@@ -1901,11 +1901,23 @@ no_journal:
116 fix_problem(ctx, PR_6_IO_FLUSH, &pctx);
117
118 if (was_changed) {
119- exit_value |= FSCK_NONDESTRUCT;
120- if (!(ctx->options & E2F_OPT_PREEN))
121- log_out(ctx, _("\n%s: ***** FILE SYSTEM WAS "
122- "MODIFIED *****\n"),
123+ int fs_fixed = (ctx->flags & E2F_FLAG_PROBLEMS_FIXED);
124+
125+ if (fs_fixed)
126+ exit_value |= FSCK_NONDESTRUCT;
127+ if (!(ctx->options & E2F_OPT_PREEN)) {
128+#if 0 /* Do this later; it breaks too many tests' golden outputs */
129+ log_out(ctx, fs_fixed ?
130+ _("\n%s: ***** FILE SYSTEM ERRORS "
131+ "CORRECTED *****\n") :
132+ _("%s: File system was modified.\n"),
133 ctx->device_name);
134+#else
135+ log_out(ctx,
136+ _("\n%s: ***** FILE SYSTEM WAS MODIFIED *****\n"),
137+ ctx->device_name);
138+#endif
139+ }
140 if (ctx->mount_flags & EXT2_MF_ISROOT) {
141 log_out(ctx, _("%s: ***** REBOOT SYSTEM *****\n"),
142 ctx->device_name);
143diff --git a/tests/f_collapse_extent_tree/expect.1 b/tests/f_collapse_extent_tree/expect.1
144index e2eb65e..8165a58 100644
145--- a/tests/f_collapse_extent_tree/expect.1
146+++ b/tests/f_collapse_extent_tree/expect.1
147@@ -13,4 +13,4 @@ Pass 5: Checking group summary information
148
149 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
150 test_filesys: 12/128 files (0.0% non-contiguous), 19/512 blocks
151-Exit status is 1
152+Exit status is 0
153diff --git a/tests/f_compress_extent_tree_level/expect.1 b/tests/f_compress_extent_tree_level/expect.1
154index a359c99..dd33f63 100644
155--- a/tests/f_compress_extent_tree_level/expect.1
156+++ b/tests/f_compress_extent_tree_level/expect.1
157@@ -20,4 +20,4 @@ Pass 5: Checking group summary information
158
159 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
160 test_filesys: 12/128 files (8.3% non-contiguous), 26/512 blocks
161-Exit status is 1
162+Exit status is 0
163diff --git a/tests/f_convert_bmap/expect.1 b/tests/f_convert_bmap/expect.1
164index 7d2ca86..c387962 100644
165--- a/tests/f_convert_bmap/expect.1
166+++ b/tests/f_convert_bmap/expect.1
167@@ -23,4 +23,4 @@ Pass 5: Checking group summary information
168
169 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
170 test_filesys: 12/128 files (8.3% non-contiguous), 570/2048 blocks
171-Exit status is 1
172+Exit status is 0
173diff --git a/tests/f_convert_bmap_and_extent/expect.1 b/tests/f_convert_bmap_and_extent/expect.1
174index 7af91aa..c86c571 100644
175--- a/tests/f_convert_bmap_and_extent/expect.1
176+++ b/tests/f_convert_bmap_and_extent/expect.1
177@@ -30,4 +30,4 @@ Pass 5: Checking group summary information
178
179 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
180 test_filesys: 13/128 files (15.4% non-contiguous), 574/2048 blocks
181-Exit status is 1
182+Exit status is 0
183diff --git a/tests/f_extent_htree/expect.1 b/tests/f_extent_htree/expect.1
184index 223ca69..ea48405 100644
185--- a/tests/f_extent_htree/expect.1
186+++ b/tests/f_extent_htree/expect.1
187@@ -26,4 +26,4 @@ test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
188 0 sockets
189 ------------
190 343 files
191-Exit status is 1
192+Exit status is 0
193diff --git a/tests/f_jnl_errno/expect.1 b/tests/f_jnl_errno/expect.1
194index c572951..4134234 100644
195--- a/tests/f_jnl_errno/expect.1
196+++ b/tests/f_jnl_errno/expect.1
197@@ -6,4 +6,4 @@ Pass 5: Checking group summary information
198
199 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
200 test_filesys: 11/2048 files (9.1% non-contiguous), 1330/8192 blocks
201-Exit status is 1
202+Exit status is 0
203diff --git a/tests/f_journal/expect.1 b/tests/f_journal/expect.1
204index a202c80..0a18654 100644
205--- a/tests/f_journal/expect.1
206+++ b/tests/f_journal/expect.1
207@@ -59,4 +59,4 @@ Pass 5: Checking group summary information
208
209 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
210 test_filesys: 53/2048 files (1.9% non-contiguous), 1409/8192 blocks
211-Exit status is 1
212+Exit status is 0
213diff --git a/tests/f_orphan/expect.1 b/tests/f_orphan/expect.1
214index eddc1f8..087ebee 100644
215--- a/tests/f_orphan/expect.1
216+++ b/tests/f_orphan/expect.1
217@@ -11,4 +11,4 @@ Pass 5: Checking group summary information
218
219 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
220 test_filesys: 12/2048 files (0.0% non-contiguous), 1303/8192 blocks
221-Exit status is 1
222+Exit status is 0
223diff --git a/tests/f_orphan_extents_inode/expect.1 b/tests/f_orphan_extents_inode/expect.1
224index 2eaab78..5d713b3 100644
225--- a/tests/f_orphan_extents_inode/expect.1
226+++ b/tests/f_orphan_extents_inode/expect.1
227@@ -7,4 +7,4 @@ Pass 5: Checking group summary information
228
229 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
230 test_filesys: 12/16 files (0.0% non-contiguous), 21/100 blocks
231-Exit status is 1
232+Exit status is 0
233diff --git a/tests/f_rehash_dir/expect.1 b/tests/f_rehash_dir/expect.1
234index 6076765..c1449ba 100644
235--- a/tests/f_rehash_dir/expect.1
236+++ b/tests/f_rehash_dir/expect.1
237@@ -7,4 +7,4 @@ Pass 5: Checking group summary information
238
239 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
240 test_filesys: 105/2048 files (2.9% non-contiguous), 336/512 blocks
241-Exit status is 1
242+Exit status is 0
243diff --git a/tests/f_unsorted_EAs/expect.1 b/tests/f_unsorted_EAs/expect.1
244index 7d588d7..64b9045 100644
245--- a/tests/f_unsorted_EAs/expect.1
246+++ b/tests/f_unsorted_EAs/expect.1
247@@ -8,4 +8,4 @@ Pass 5: Checking group summary information
248
249 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
250 test_filesys: 12/2048 files (0.0% non-contiguous), 1294/2048 blocks
251-Exit status is 1
252+Exit status is 0
253--
2541.9.1
255
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch
deleted file mode 100644
index abbf2bad26..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch
+++ /dev/null
@@ -1,130 +0,0 @@
1From 30ef41f68703b6a16027cc8787118b87f1462dff Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier@gentoo.org>
3Date: Mon, 28 Mar 2016 20:31:33 -0400
4Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed
5
6The minor/major/makedev macros are not entirely standard. glibc has had
7the definitions in sys/sysmacros.h since the start, and wants to move away
8from always defining them implicitly via sys/types.h (as this pollutes the
9namespace in violation of POSIX). Other C libraries have already dropped
10them. Since the configure script already checks for this header, use that
11to pull in the header in files that use these macros.
12
13Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14
15Taken from gentoo portage.
16
17Upstream-Status: Pending
18
19---
20 debugfs/debugfs.c | 3 +++
21 lib/blkid/devname.c | 3 +++
22 lib/blkid/devno.c | 3 +++
23 lib/ext2fs/finddev.c | 3 +++
24 lib/ext2fs/ismounted.c | 3 +++
25 misc/create_inode.c | 4 ++++
26 misc/mk_hugefiles.c | 3 +++
27 7 files changed, 22 insertions(+)
28
29diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
30index ba8be40..7d481bc 100644
31--- a/debugfs/debugfs.c
32+++ b/debugfs/debugfs.c
33@@ -26,6 +26,9 @@ extern char *optarg;
34 #include <errno.h>
35 #endif
36 #include <fcntl.h>
37+#ifdef HAVE_SYS_SYSMACROS_H
38+#include <sys/sysmacros.h>
39+#endif
40
41 #include "debugfs.h"
42 #include "uuid/uuid.h"
43diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
44index 3e2efa9..671e781 100644
45--- a/lib/blkid/devname.c
46+++ b/lib/blkid/devname.c
47@@ -36,6 +36,9 @@
48 #if HAVE_SYS_MKDEV_H
49 #include <sys/mkdev.h>
50 #endif
51+#ifdef HAVE_SYS_SYSMACROS_H
52+#include <sys/sysmacros.h>
53+#endif
54 #include <time.h>
55
56 #include "blkidP.h"
57diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
58index 479d977..61e6fc7 100644
59--- a/lib/blkid/devno.c
60+++ b/lib/blkid/devno.c
61@@ -31,6 +31,9 @@
62 #if HAVE_SYS_MKDEV_H
63 #include <sys/mkdev.h>
64 #endif
65+#ifdef HAVE_SYS_SYSMACROS_H
66+#include <sys/sysmacros.h>
67+#endif
68
69 #include "blkidP.h"
70
71diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
72index 311608d..62fa0db 100644
73--- a/lib/ext2fs/finddev.c
74+++ b/lib/ext2fs/finddev.c
75@@ -31,6 +31,9 @@
76 #if HAVE_SYS_MKDEV_H
77 #include <sys/mkdev.h>
78 #endif
79+#ifdef HAVE_SYS_SYSMACROS_H
80+#include <sys/sysmacros.h>
81+#endif
82
83 #include "ext2_fs.h"
84 #include "ext2fs.h"
85diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
86index e0f69dd..7404996 100644
87--- a/lib/ext2fs/ismounted.c
88+++ b/lib/ext2fs/ismounted.c
89@@ -49,6 +49,9 @@
90 #if HAVE_SYS_TYPES_H
91 #include <sys/types.h>
92 #endif
93+#ifdef HAVE_SYS_SYSMACROS_H
94+#include <sys/sysmacros.h>
95+#endif
96
97 #include "ext2_fs.h"
98 #include "ext2fs.h"
99diff --git a/misc/create_inode.c b/misc/create_inode.c
100index 4dbd8e5..98aeb41 100644
101--- a/misc/create_inode.c
102+++ b/misc/create_inode.c
103@@ -22,6 +22,10 @@
104 #include <attr/xattr.h>
105 #endif
106 #include <sys/ioctl.h>
107+#ifdef HAVE_SYS_SYSMACROS_H
108+#include <sys/sysmacros.h>
109+#endif
110+
111 #include <ext2fs/ext2fs.h>
112 #include <ext2fs/ext2_types.h>
113 #include <ext2fs/fiemap.h>
114diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
115index 71a15c5..00e95cd 100644
116--- a/misc/mk_hugefiles.c
117+++ b/misc/mk_hugefiles.c
118@@ -35,6 +35,9 @@ extern int optind;
119 #include <sys/ioctl.h>
120 #include <sys/types.h>
121 #include <sys/stat.h>
122+#ifdef HAVE_SYS_SYSMACROS_H
123+#include <sys/sysmacros.h>
124+#endif
125 #include <libgen.h>
126 #include <limits.h>
127 #include <blkid/blkid.h>
128--
1292.8.2
130
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb
index 56929c9d5d..fb02d796a7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb
@@ -7,15 +7,13 @@ SRC_URI += "file://acinclude.m4 \
7 file://ptest.patch \ 7 file://ptest.patch \
8 file://mkdir.patch \ 8 file://mkdir.patch \
9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ 9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
10 file://e2fsprogs-1.43-sysmacros.patch \
11 file://mkdir_p.patch \ 10 file://mkdir_p.patch \
12 file://0001-e2fsck-exit-with-exit-status-0-if-no-errors-were-fix.patch \
13 file://reproducible-doc.patch \ 11 file://reproducible-doc.patch \
14" 12"
15 13
16SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" 14SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"
17 15
18SRCREV = "3d66c4b20f09f923078c1e6eb9b549865b549674" 16SRCREV = "2a13c84b513aa094d1cda727e92d35a89dd777da"
19UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" 17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
20 18
21EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 19EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-11 10:45:43 +0000