summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2014-06-08 20:22:33 +0200
committerMartin Väth <martin@mvath.de>2015-10-11 10:49:10 +0200
commitc31079a021513d52bc1431dff653012f82f5ad72 (patch)
treed33a5916cfda3923830a2468ecf574c48692071d /sys-fs/squashfs-tools/files
parentAdd systemd-cron (diff)
downloadmv-c31079a021513d52bc1431dff653012f82f5ad72.tar.gz
mv-c31079a021513d52bc1431dff653012f82f5ad72.tar.bz2
mv-c31079a021513d52bc1431dff653012f82f5ad72.zip
Bump squashfs-tools, squashmount. Use mksquashfs -quiet patch
Diffstat (limited to 'sys-fs/squashfs-tools/files')
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch26
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch37
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch29
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch29
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch60
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch56
6 files changed, 56 insertions, 181 deletions
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch
deleted file mode 100644
index 0392ba24..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -1832,17 +1832,17 @@
- if(!progress || columns - used < 0)
- return;
-
-- printf("\r[");
-+ fprintf(stderr, "\r[");
-
- while (hashes --)
-- putchar('=');
-+ putc('=', stderr);
-
- while(spaces --)
-- putchar(' ');
-+ putc(' ', stderr);
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr, " %3lld%%", current * 100 / max);
-+ fflush(stderr);
- }
-
-
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch
deleted file mode 100644
index 422d7c2b..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -2254,26 +2254,26 @@
- int spaces = columns - used - hashes;
-
- if(current > max) {
-- printf("%lld %lld\n", current, max);
-+ fprintf(stderr, "%lld %lld\n", current, max);
- return;
- }
-
- if(columns - used < 0)
- return;
-
-- printf("\r[");
-+ fprintf(stderr, "\r[");
-
- while (hashes --)
-- putchar('=');
-+ putc('=', stderr);
-
-- putchar(rotate_list[rotate]);
-+ putc(rotate_list[rotate], stderr);
-
- while(spaces --)
-- putchar(' ');
-+ putc(' ', stderr);
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr, " %3lld%%", current * 100 / max);
-+ fflush(stderr);
- }
-
-
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch
deleted file mode 100644
index 832a17e2..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -2570,19 +2570,19 @@
- previous = current;
- }
-
-- printf("\r[");
-+ fprintf(stderr, "\r[");
-
- while (hashes --)
-- putchar('=');
-+ putc('=', stderr);
-
-- putchar(rotate_list[rotate]);
-+ putc(rotate_list[rotate], stderr);
-
- while(spaces --)
-- putchar(' ');
-+ putc(' ', stderr);
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr, " %3lld%%", current * 100 / max);
-+ fflush(stderr);
- }
-
-
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
deleted file mode 100644
index dd0c2279..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 1/progressbar.c
-+++ 1/progressbar.c
-@@ -119,19 +119,19 @@
- previous = current;
- }
-
-- printf("\r[");
-+ fprintf(stderr, "\r[");
-
- while (hashes --)
-- putchar('=');
-+ putc('=', stderr);
-
-- putchar(rotate_list[rotate]);
-+ putc(rotate_list[rotate], stderr);
-
- while(spaces --)
-- putchar(' ');
-+ putc(' ', stderr);
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr, " %3lld%%", current * 100 / max);
-+ fflush(stderr);
- }
-
-
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch
deleted file mode 100644
index 5ab05bda..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- progressbar.c.bak/progressbar.c.bak
-+++ progressbar.c.bak/progressbar.c
-@@ -56,8 +56,8 @@
- {
- struct winsize winsize;
-
-- if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
-- if(isatty(STDOUT_FILENO))
-+ if(ioctl(2, TIOCGWINSZ, &winsize) == -1) {
-+ if(isatty(STDERR_FILENO))
- ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 "
- "columns\n");
- columns = 80;
-@@ -108,7 +108,7 @@
- return;
-
- if(tty == -1)
-- tty = isatty(STDOUT_FILENO);
-+ tty = isatty(STDERR_FILENO);
- if(!tty) {
- static long long previous = -1;
-
-@@ -122,19 +122,19 @@
- previous = current;
- }
-
-- printf("\r[");
-+ fprintf(stderr, "\r[");
-
- while (hashes --)
-- putchar('=');
-+ putc('=', stderr);
-
-- putchar(rotate_list[rotate]);
-+ putc(rotate_list[rotate], stderr);
-
- while(spaces --)
-- putchar(' ');
-+ putc(' ', stderr);
-
-- printf("] %*lld/%*lld", max_digits, current, max_digits, max);
-- printf(" %3lld%%", current * 100 / max);
-- fflush(stdout);
-+ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
-+ fprintf(stderr, " %3lld%%", current * 100 / max);
-+ fflush(stderr);
- }
-
-
-@@ -180,8 +180,8 @@
- struct itimerval itimerval;
- struct winsize winsize;
-
-- if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
-- if(isatty(STDOUT_FILENO))
-+ if(ioctl(2, TIOCGWINSZ, &winsize) == -1) {
-+ if(isatty(STDERR_FILENO))
- ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 "
- "columns\n");
- columns = 80;
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
new file mode 100644
index 00000000..c4fe57de
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
@@ -0,0 +1,56 @@
+--- 1/squashfs-tools/mksquashfs.c
++++ 1/squashfs-tools/mksquashfs.c
+@@ -78,6 +78,7 @@
+ #include "process_fragments.h"
+
+ int delete = FALSE;
++int quiet = FALSE;
+ int fd;
+ struct squashfs_super_block sBlk;
+
+@@ -4169,7 +4170,7 @@
+
+ main_thread = pthread_self();
+
+- printf("Parallel mksquashfs: Using %d processor%s\n", processors,
++ quiet || printf("Parallel mksquashfs: Using %d processor%s\n", processors,
+ processors == 1 ? "" : "s");
+
+ /* Restore the signal mask for the main thread */
+@@ -4687,6 +4688,9 @@
+ total_bytes += total_inode_bytes + total_directory_bytes +
+ sizeof(struct squashfs_super_block) + total_xattr_bytes;
+
++ if(quiet)
++ return;
++
+ printf("\n%sSquashfs %d.%d filesystem, %s compressed, data block size"
+ " %d\n", exportable ? "Exportable " : "", SQUASHFS_MAJOR,
+ SQUASHFS_MINOR, comp->name, block_size);
+@@ -5259,6 +5263,9 @@
+ else if(strcmp(argv[i], "-noappend") == 0)
+ delete = TRUE;
+
++ else if(strcmp(argv[i], "-quiet") == 0)
++ quiet = TRUE;
++
+ else if(strcmp(argv[i], "-keep-as-directory") == 0)
+ keep_as_directory = TRUE;
+
+@@ -5351,6 +5358,7 @@
+ "using recovery file <name>\n");
+ ERROR("-no-recovery\t\tdon't generate a recovery "
+ "file\n");
++ ERROR("-quiet\t\t\tno verbose output\n");
+ ERROR("-info\t\t\tprint files written to filesystem\n");
+ ERROR("-no-progress\t\tdon't display the progress "
+ "bar\n");
+@@ -5541,7 +5549,7 @@
+ void *comp_data = compressor_dump_options(comp, block_size,
+ &size);
+
+- printf("Creating %d.%d filesystem on %s, block size %d.\n",
++ quiet || printf("Creating %d.%d filesystem on %s, block size %d.\n",
+ SQUASHFS_MAJOR, SQUASHFS_MINOR, argv[source + 1], block_size);
+
+ /*