Skip to content

Address issue #36 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzpqnxow wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Address issue #36 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6854267
add second patch to address issue #36; should be coalesced into one f…
mzpqnxow Jan 13, 2022
b7fc759
Add patch for #36
mzpqnxow Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions patches/patch1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;