Commit Graph

25 Commits

Author SHA1 Message Date
Christian Marangi
c7c3208192
tools/squashfs4: backport OpenWrt extended options patch
Due to us keeping a patch around for years and never proposing it to
squashfs4 repository, we resulted in having the same squashfs4 version
but with different supported options. (openwrt patched -- upstream)

To workaround this problem, a non-standard option was required.

To not have surprise on tool bump, backport the patch and add the new
config option required to enable these extended non-standard options.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-04-20 21:30:52 +02:00
Christian Marangi
4532919711
tools/squashfs4: refresh multiple lzma configuration option patch
Refresh multiple lzma configuration option patch with new version
proposed upstream. (Reintroduce -Xe option and add more checks and
general better code quality)

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-04-12 12:31:13 +02:00
Linhui Liu
f0103c78d8 tools/squashfs4: bump to 4.6.1
Changelogs:
https://github.com/plougher/squashfs-tools/blob/4.6.1/CHANGES

Removed upstreamed patches:
- 001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch
- 002-Mksquashfs-Make-sysinfo-conditional.patch
- 003-Only-use-available-CPUs.patch
- 004-action-rework-strdupa-with-POSIX-strdup-and-free.patch
- 005-Don-t-use-sigwaitinfo-sigtimedwait-if-not-supported.patch
- 006-Move-sysinfo.h-into-the-linux-only-section-should-fi.patch
- 007-Unsquashfs-fix-compilation-error-for-missing-sysctl..patch
- 100-portability.patch

Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
2023-04-01 21:58:31 +02:00
Christian Marangi
30f2d516ba
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>
2023-02-20 07:34:03 +01:00
Alexander Couzens
889b6423b7
tools: migrate from squashfs4 to squashfskit4
squashfskit is a fork of the squashfs-tools.
squashfskit creates reproducible filesystems and includes
many of the distro patches.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Tested-by: Paul Spooren <mail@aparcar.org>
2019-02-28 01:38:46 +01:00
Alex Maclean
4425fa84da tools/squashfs4: include sysmacros.h explicitly
glibc is moving to remove the include of sys/sysmacros.h from
sys/types.h, and some distros have done this early. Other libcs may
already lack this include. Include sysmacros.h explicitly.

Fixes: FS#1017

Signed-off-by: Alex Maclean <monkeh@monkeh.net>
[refresh patches]
Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-10-27 11:19:38 +02:00
Hauke Mehrtens
f97ad870e1 squashfs4: use upstream xz compression header format
In the upstream kernel and the upstream squashfs4 tools the xz
compression header looks the following:
struct disk_comp_opts {
        __le32 dictionary_size;
        __le32 flags;
};

We added some other members and also moved some existing members. Place
the members which are already in upstream header at the same position
as in that kernel and add our own at the end. The kernel should not
have a problem when there are some additional members and just ignore
them.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2016-06-22 19:32:06 +02:00
Felix Fietkau
d437c72c21 tools/squashfs4: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47869
2015-12-11 19:21:43 +00:00
John Crispin
fd1c1b4918 tools/squashfs: add argument -fixed-time to set all timestamps
-fixed-time <timestamp> set mkfs-timestamp and file-mtime to this timestamp.
Reproducible builds requires the removal of all timestamp or setting all to a specific one.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 47858
2015-12-11 15:07:15 +00:00
Felix Fietkau
7a59e5b368 squashfs4: make inline functions static to fix build errors
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38562
2013-10-28 15:15:16 +00:00
Felix Fietkau
1f77bfff96 build: BSD compile fixes
following patch allows to build images for Qemu ARM on
OpenBSD 5.2 amd64 and FreeBSD 9.1 amd64.

Mostly small pieces of code changes to get things right on the
specific platform.

Updated the README to describe better, which tools on the host
are required. Added some kind of prepare scripts to install needed
tools on BSD via packages.

Signed-off-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de>

SVN-Revision: 35900
2013-03-07 17:32:29 +00:00
Jonas Gorski
90673a048c squashfs4: Add support for LZMA Magic to unsquashfs
Some vendor firmwares use a different super block magic to indicate LZMA
compression. This patches adds support for detecting this and enable
extraction for those firmware's root filesystems.

SVN-Revision: 28489
2011-10-19 10:17:28 +00:00
Felix Fietkau
fa9521ad91 squashfs4: fix a compile error on big-endian systems (patch from #9842)
SVN-Revision: 27851
2011-07-31 17:59:31 +00:00
Felix Fietkau
de23984834 squashfs4: add missing include for freebsd (patch from #9842)
SVN-Revision: 27850
2011-07-31 17:59:25 +00:00
Felix Fietkau
e6aa1cab00 tools/squashfs4: update to version 4.2 (adds support for xz compression)
Based on a patch by Jonas Gorski

SVN-Revision: 26422
2011-04-03 01:02:00 +00:00
Felix Fietkau
23ef9fcc6a squashfs4: make the lzma parameters configurable, and change the defaults for slightly improved compression on mips (mostly unchanged on other architectures)
SVN-Revision: 25530
2011-02-13 19:59:02 +00:00
Jo-Philipp Wich
f8c3ebc7c6 squashfs4: fix compilation on FreeBSD
SVN-Revision: 22347
2010-07-22 03:09:10 +00:00
Felix Fietkau
67b4181c8a squashfs4: backport an upstream change to fix the file mode check to allow setuid/setgid binaries (thx, ermo) - fixes #7653
SVN-Revision: 22334
2010-07-21 17:31:16 +00:00
Felix Fietkau
c79b439709 squashfs4: use our lzma props settings again instead of the defaults (smaller images on arm/mips)
SVN-Revision: 18273
2009-11-02 14:52:15 +00:00
Felix Fietkau
2ecc782491 squashfs4: refresh the cygwin patch
SVN-Revision: 18272
2009-11-02 14:52:09 +00:00
Felix Fietkau
6b09768275 squashfs4: fix build breakage
SVN-Revision: 18271
2009-11-02 14:52:03 +00:00
Imre Kaloz
4364bc210e sync mksquashfs4 with the CVS code to generate LZMA images
SVN-Revision: 18268
2009-11-02 09:52:54 +00:00
Matteo Croce
9f53073e97 fix error in mksquashfs4 when data can't be compressed
SVN-Revision: 17585
2009-09-15 09:01:27 +00:00
Florian Fainelli
8868aa88c8 build fixes for squashfs4 on cygwin
SVN-Revision: 17430
2009-08-27 19:47:13 +00:00
Felix Fietkau
bc152ef2c5 squashfs4: add lzma support (kernel support still missing)
SVN-Revision: 15884
2009-05-17 00:57:52 +00:00