From d33b4b65642d2989249a16ce207cd5cab156a55f Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 8 Feb 2022 00:00:49 +0300 Subject: [PATCH] feat: support zstd compression This adds zstd binaries and libraries and enables zstd in the mksquashfs. Signed-off-by: Andrey Smirnov --- squashfs-tools/pkg.yaml | 3 ++- tools/pkg.yaml | 1 + zstd/pkg.yaml | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 zstd/pkg.yaml diff --git a/squashfs-tools/pkg.yaml b/squashfs-tools/pkg.yaml index c20880e..8537487 100644 --- a/squashfs-tools/pkg.yaml +++ b/squashfs-tools/pkg.yaml @@ -3,6 +3,7 @@ dependencies: - stage: base - stage: xz - stage: zlib + - stage: zstd - stage: patch steps: - sources: @@ -18,7 +19,7 @@ steps: build: - | cd squashfs-tools - make LDFLAGS="$LDFLAGS -Wl,-rpath=/toolchain/lib" XZ_SUPPORT=1 LZMA_XZ_SUPPORT=0 LZMA_SUPPORT=0 + make LDFLAGS="$LDFLAGS -Wl,-rpath=/toolchain/lib" XZ_SUPPORT=1 LZMA_XZ_SUPPORT=0 LZMA_SUPPORT=0 ZSTD_SUPPORT=1 install: - | cd squashfs-tools diff --git a/tools/pkg.yaml b/tools/pkg.yaml index cb0365b..32dd07b 100644 --- a/tools/pkg.yaml +++ b/tools/pkg.yaml @@ -62,6 +62,7 @@ dependencies: - stage: util-linux - stage: xz - stage: zlib + - stage: zstd steps: - prepare: - | diff --git a/zstd/pkg.yaml b/zstd/pkg.yaml new file mode 100644 index 0000000..2c004e0 --- /dev/null +++ b/zstd/pkg.yaml @@ -0,0 +1,25 @@ +name: zstd +dependencies: + - stage: base +steps: + - sources: + - url: https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz + destination: zstd.tar.gz + sha256: 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 + sha512: 96dbd2eb6623e3564a0fd36489b61bc3cb27758a584fdc9f064f3985d2e8b5605d7022890d00a6d15464d3cd0707d7e75d8cf6210323782d0af406b90a6d6784 + env: + PREFIX: /toolchain + CFLAGS: -O2 + prepare: + - | + tar -xzf zstd.tar.gz --strip-components=1 + build: + - | + make -j $(nproc) -C lib HAVE_PTHREAD=1 HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0 lib-mt + make -j $(nproc) -C programs HAVE_PTHREAD=1 HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0 + install: + - | + make DESTDIR=/rootfs install +finalize: + - from: /rootfs + to: /