logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 991029ac4f300f1014670a7bedd41f4539e859a3
parent 057abfd39b0fc826e49b37b36daeda30d8bc866c
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 10 Jan 2020 21:27:20 -0800

Add squashfs-tools 4.4

Diffstat:

M.gitmodules3+++
Mpkg/gen.lua1+
Apkg/squashfs-tools/gen.lua47+++++++++++++++++++++++++++++++++++++++++++++++
Apkg/squashfs-tools/src1+
Apkg/squashfs-tools/ver1+
5 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -249,6 +249,9 @@ [submodule "pkg/sinit/src"] path = pkg/sinit/src url = git://git.suckless.org/sinit +[submodule "pkg/squashfs-tools/src"] + path = pkg/squashfs-tools/src + url = https://github.com/plougher/squashfs-tools.git [submodule "pkg/sshfs/src"] path = pkg/sshfs/src url = https://github.com/libfuse/sshfs diff --git a/pkg/gen.lua b/pkg/gen.lua @@ -87,6 +87,7 @@ subgen 'sbase' subgen 'sdhcp' subgen 'sinit' subgen 'skeleton' +subgen 'squashfs-tools' subgen 'sshfs' subgen 'st' subgen 'strace' diff --git a/pkg/squashfs-tools/gen.lua b/pkg/squashfs-tools/gen.lua @@ -0,0 +1,47 @@ +cflags{ + '-Wall', + '-D _GNU_SOURCE', + '-D REPRODUCIBLE_DEFAULT', + '-D GZIP_SUPPORT', + '-D ZSTD_SUPPORT', + [[-D 'COMP_DEFAULT="zstd"']], +} + +cc('squashfs-tools/gzip_wrapper.c', {'pkg/zlib/headers'}, { + cflags='$cflags -I $builddir/pkg/zlib/include', +}) + +cc('squashfs-tools/zstd_wrapper.c', {'$basedir/pkg/zstd/fetch'}, { + cflags='$cflags -I $basedir/pkg/zstd/src/lib -I $basedir/pkg/zstd/src/lib/common' +}) + +objects([[squashfs-tools/(swap.c compressor.c)]]) + +exe('mksquashfs', [[ + squashfs-tools/( + mksquashfs.c read_fs.c action.c swap.c.o pseudo.c compressor.c.o + sort.c progressbar.c read_file.c info.c restore.c process_fragments.c + caches-queues-lists.c + + gzip_wrapper.c.o + zstd_wrapper.c.o + ) + $builddir/pkg/zlib/libz.a + $builddir/pkg/zstd/libzstd.a +]]) +file('bin/mksquashfs', '755', '$outdir/mksquashfs') + +exe('unsquashfs', [[ + squashfs-tools/( + unsquashfs.c unsquash-1.c unsquash-2.c unsquash-3.c + unsquash-4.c unsquash-123.c unsquash-34.c swap.c.o compressor.c.o unsquashfs_info.c + + gzip_wrapper.c.o + zstd_wrapper.c.o + ) + $builddir/pkg/zlib/libz.a + $builddir/pkg/zstd/libzstd.a +]]) +file('bin/unsquashfs', '755', '$outdir/unsquashfs') + +fetch 'git' diff --git a/pkg/squashfs-tools/src b/pkg/squashfs-tools/src @@ -0,0 +1 @@ +Subproject commit 52eb4c279cd283ed9802dd1ceb686560b22ffb67 diff --git a/pkg/squashfs-tools/ver b/pkg/squashfs-tools/ver @@ -0,0 +1 @@ +4.4 r0