diff options
author | Christian Marangi <ansuelsmth@gmail.com> | 2023-02-06 23:22:43 +0100 |
---|---|---|
committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-02-20 07:34:03 +0100 |
commit | 30f2d516ba7be08f06f7ca8767472c3ea5678706 (patch) | |
tree | 6a76fef0e685764abd5f3ed2df2ebcce7856b219 /tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch | |
parent | 57db2280a2155c39f545ac712766a849cf45f62c (diff) | |
download | upstream-30f2d516ba7be08f06f7ca8767472c3ea5678706.tar.gz upstream-30f2d516ba7be08f06f7ca8767472c3ea5678706.tar.bz2 upstream-30f2d516ba7be08f06f7ca8767472c3ea5678706.zip |
tools/squashfs4: add new tool for squashfs4 images
squashfs tool is finally reborn and correctly maintained.
Introduce the new version as a replacement for squasfs4kit as it was a
fork and also abandoned.
Add additional patch to add the missing feature present in squashfskit4
but still missing on this new project.
Backport each required patch that fix compilation error on macos.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch')
-rw-r--r-- | tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch b/tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch new file mode 100644 index 0000000000..2fdb509492 --- /dev/null +++ b/tools/squashfs4/patches/001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch @@ -0,0 +1,39 @@ +From a9119c969af0a5aa961d56978d5dd4f3eb952667 Mon Sep 17 00:00:00 2001 +From: Phillip Lougher <phillip@squashfs.org.uk> +Date: Mon, 15 Aug 2022 17:04:43 +0100 +Subject: [PATCH 1/1] Unsquashfs: Add and make some header includes conditional + +Fixes https://github.com/plougher/squashfs-tools/issues/122 + +Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> +--- + squashfs-tools/reader.c | 1 + + squashfs-tools/unsquashfs.c | 5 +++++ + 2 files changed, 6 insertions(+) + +--- a/squashfs-tools/reader.c ++++ b/squashfs-tools/reader.c +@@ -38,6 +38,7 @@ + #include <errno.h> + #include <stdlib.h> + #include <stdio.h> ++#include <signal.h> + #include "squashfs_fs.h" + #include "mksquashfs.h" + #include "caches-queues-lists.h" +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -32,8 +32,13 @@ + #include "stdarg.h" + #include "fnmatch_compat.h" + ++#ifdef __linux__ + #include <sys/sysinfo.h> + #include <sys/sysmacros.h> ++#elif defined __FreeBSD__ ++#include <sys/sysctl.h> ++#endif ++ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> |