e2fsprogs: silence debugfs

debugfs echos the commands when it is executing a script, but as the scripts
used at rootfs time are long this massively inflates the do_rootfs log.

Comment out the echo so that the rootfs isn't 20K lines longer than it needs to
be.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch
new file mode 100644 (file)
index 0000000..830e9d5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch
@@ -0,0 +1,19 @@
+When executing a script don't echo every command, as we do this for entire
+filesystems at rootfs time.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+index 5590295..ac57292 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -2378,7 +2378,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+               cp = strchr(buf, '\r');
+               if (cp)
+                       *cp = 0;
+-              printf("debugfs: %s\n", buf);
++              /*printf("debugfs: %s\n", buf);*/
+               retval = ss_execute_line(ss_idx, buf);
+               if (retval) {
+                       ss_perror(ss_idx, retval, buf);

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
index 22ad925fe2f7e19b52de4fa89bbd51aa0fd198ea..6175ce7281e1bc3a81593d70a7177b084e02f41a 100644 (file)
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
@@ -9,6 +9,7 @@ SRC_URI += "file://acinclude.m4 \
             file://debugfs-extent-header.patch \
             file://populate-extfs.sh \
             file://e2fsprogs-fix-tests-f_extent_oobounds.patch \
+            file://quiet-debugfs.patch \
 "
 
 SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"