From 68542671857e19bb6f165877ca33656df79309a4 Mon Sep 17 00:00:00 2001 From: Adam Greene Date: Thu, 13 Jan 2022 13:09:06 -0500 Subject: [PATCH 1/2] add second patch to address issue #36; should be coalesced into one full/clean patch --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index b1bc341..b55de08 100755 --- a/build.sh +++ b/build.sh @@ -33,5 +33,7 @@ tar -zxvf squashfs4.3.tar.gz # Patch, build, and install the source cd squashfs4.3 patch -p0 < ../patches/patch0.txt +# Issue #36 +patch -p0 < ../patches/patch1.txt cd squashfs-tools make && $SUDO make install From b7fc7591ffc1358a6e37638c62585351623803f9 Mon Sep 17 00:00:00 2001 From: Adam Greene Date: Sun, 6 Feb 2022 10:36:34 -0500 Subject: [PATCH 2/2] Add patch for #36 --- patches/patch1.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 patches/patch1.txt diff --git a/patches/patch1.txt b/patches/patch1.txt new file mode 100644 index 0000000..4f10506 --- /dev/null +++ b/patches/patch1.txt @@ -0,0 +1,23 @@ +diff --strip-trailing-cr -NBbaur squashfs-tools/error.h squashfs-tools-patched/error.h +--- squashfs-tools/error.h 2022-01-13 13:02:42.162534509 -0500 ++++ squashfs-tools-patched/error.h 2022-01-13 13:03:10.842309065 -0500 +@@ -31,7 +31,7 @@ + extern void progressbar_info(char *fmt, ...); + + // CJH: Updated so that TRACE prints if -verbose is specified on the command line +-int verbose; ++extern int verbose; + //#ifdef SQUASHFS_TRACE + #define TRACE(s, args...) \ + do { \ +diff --strip-trailing-cr -NBbaur squashfs-tools/unsquashfs.c squashfs-tools-patched/unsquashfs.c +--- squashfs-tools/unsquashfs.c 2022-01-13 13:02:42.182534352 -0500 ++++ squashfs-tools-patched/unsquashfs.c 2022-01-13 13:03:18.406249609 -0500 +@@ -43,6 +43,7 @@ + struct queue *to_reader, *to_inflate, *to_writer, *from_writer; + pthread_t *thread, *inflator_thread; + pthread_mutex_t fragment_mutex; ++int verbose; + + /* user options that control parallelisation */ + //int processors = -1;