Skip to content

Update squashfuse to latest release #89

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

Merged
TheAssassin merged 2 commits into from
Nov 28, 2024
Merged

Update squashfuse to latest release #89

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
f97d8d5
Update squashfuse to latest release
TheAssassin Nov 27, 2024
70e238e
Merge branch 'main' into update-squashfuse-to-0.5.2
probonopd Nov 28, 2024
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
6 changes: 3 additions & 3 deletions scripts/common/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ popd
# Minimize binary size
export CFLAGS="-ffunction-sections -fdata-sections -Os"

wget "https://github.com/vasi/squashfuse/archive/e51978c.tar.gz"
echo "f544029ad30d8fbde4e4540c574b8cdc6d38b94df025a98d8551a9441f07d341 e51978c.tar.gz" | sha256sum -c -
tar xf e51978c.tar.gz
wget "https://github.com/vasi/squashfuse/archive/0.5.2.tar.gz"
echo "db0238c5981dabbd80ee09ae15387f390091668ca060a7bc38047912491443d3 0.5.2.tar.gz" | sha256sum -c -
tar xf 0.5.2.tar.gz
pushd squashfuse-*/
./autogen.sh
./configure CFLAGS="${CFLAGS} -no-pie" LDFLAGS=-static
Expand Down
6 changes: 3 additions & 3 deletions src/runtime/runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ int fusefs_main(int argc, char* argv[], void (* mounted)(void)) {
opts.offset = 0;
opts.idle_timeout_secs = 0;
if (fuse_opt_parse(&args, &opts, fuse_opts, sqfs_opt_proc) == -1)
sqfs_usage(argv[0], true);
sqfs_usage(argv[0], true, true);

#if FUSE_USE_VERSION >= 30
if (fuse_parse_cmdline(&args, &fuse_cmdline_opts) != 0)
Expand All @@ -1042,9 +1042,9 @@ int fusefs_main(int argc, char* argv[], void (* mounted)(void)) {
&fuse_cmdline_opts.mt,
&fuse_cmdline_opts.foreground) == -1)
#endif
sqfs_usage(argv[0], true);
sqfs_usage(argv[0], true, true);
if (fuse_cmdline_opts.mountpoint == NULL)
sqfs_usage(argv[0], true);
sqfs_usage(argv[0], true, true);

/* fuse_daemonize() will unconditionally clobber fds 0-2.
*
Expand Down