sys-fs/squashfs-tools: Sync with Gentoo

It's from Gentoo commit 130f3cbc7a9520727cf4739cf012571f8b88d13d.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-09-22 07:11:44 +00:00 committed by Krzesimir Nowak
parent 37356748e1
commit 6bbd4e83fd
8 changed files with 1 additions and 333 deletions

View File

@ -1,6 +1 @@
DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
DIST squashfs-tools-4.6.1.tar.gz 286848 BLAKE2B 05e38681de219413573e8b1a7f36d2f7e87734f68a929ecdeb5ae6017076fbfd67b897448980e047689ef4b154d2dcd1a90162367a6a5babab45f1ef36f09325 SHA512 10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb
DIST squashfs-tools-4.6.tar.gz 286409 BLAKE2B 1c04a8f6149863667151e76b3c1ecfdd5e9a181b305bea694af1d4968ac361114c9e926b351dcee2647796a21bc8cfc55b3d95f020ad88c3388007460de26053 SHA512 3a9effb9a5cf46fbb9f393e58bd938874dc4121828b77c67d659117ee84643917998a8503d629f46f1eff1826f6d7ae59ac2d803a5cdc3cfb1006ef2b3abf8c8
DIST squashfs-tools-4.7.1.tar.gz 579808 BLAKE2B c443deb38c7c49ceaf6177748bf1dd611784b90eae28d5ea648739a5a825f166f970a36bade6e28f0001b61ad26a8872463f653162246a937bf9670af8c7bc1a SHA512 a987d40069a1bf7e96e2d4fecf39e70bb853bec8c76286329c1ada59ceb0b03f6e3555e73ecd645ad416d3cb70ae373949a366533c95a74890e3f2a73d699b91
DIST squashfs-tools-4.7.2.tar.gz 638262 BLAKE2B 7501a0ea11ae057b297d1dedcd1a4c1475a641102c0662614c820f7bed6d9437e282303d0e35b50185aa74b22d3cf8bffb4424e1e20b398ef068ef822fcb7097 SHA512 4ef134935e97267544837806d8494f7eab14bae834afdb5caf4862703652c6f33bd38ade45e3a276927bfdb4877d5474c1d5b8c14090cc3a63a80aa931e6b25f
DIST squashfs-tools-4.7.tar.gz 519217 BLAKE2B 331b5c9dfeb0c9829858a1b7e400120dc74cc503059b1c4a730633ae30d8f9839f420a042f2f3ae4b4d14eb753be622714a0cb22a1c3ac4bdf2e81d9cc77d84b SHA512 db69937dd62c61c77ee555df0346942a5da671e5a9c2e93cd76ea1132f7e20b17fc701d53d8a232b192301c4769869b6b1ea47dac877afcc8dfa9a4eea31e1e0

View File

@ -1,37 +0,0 @@
From https://github.com/plougher/squashfs-tools/pull/314 (merged)
From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 6 Jun 2025 15:23:07 +0100
Subject: [PATCH] print_pager: add missing includes
When building with musl:
print_pager.h:33:25: error: unknown type name 'pid_t'
33 | extern void wait_to_die(pid_t process);
| ^~~~~
print_pager.h:34:25: error: unknown type name 'pid_t'
34 | extern FILE *exec_pager(pid_t *process);
| ^~~~~
print_pager.h uses pid_t and FILE, so add the required #includes to
ensure that these are defined.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
squashfs-tools/print_pager.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/squashfs-tools/print_pager.h b/squashfs-tools/print_pager.h
index c33d4d2e..f3e0da6c 100644
--- a/squashfs-tools/print_pager.h
+++ b/squashfs-tools/print_pager.h
@@ -30,6 +30,9 @@
#define MORE_PAGER 2
#define UNKNOWN_PAGER 3
+#include <stdio.h>
+#include <sys/types.h>
+
extern void wait_to_die(pid_t process);
extern FILE *exec_pager(pid_t *process);
extern int get_column_width();

View File

@ -1,57 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs
DESCRIPTION="tools to create and extract Squashfs filesystems"
HOMEPAGE="https://github.com/plougher/squashfs-tools/"
SRC_URI="
https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug lz4 lzma lzo xattr zstd"
RDEPEND="
sys-libs/zlib
lz4? ( app-arch/lz4 )
lzma? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
xattr? ( sys-apps/attr )
zstd? ( app-arch/zstd )
"
DEPEND=${RDEPEND}
use10() { usex "${1}" 1 0; }
src_configure() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
EMAKE_SQUASHFS_CONF=(
LZMA_XZ_SUPPORT=$(use10 lzma)
LZO_SUPPORT=$(use10 lzo)
LZ4_SUPPORT=$(use10 lz4)
XATTR_SUPPORT=$(use10 xattr)
XZ_SUPPORT=$(use10 lzma)
ZSTD_SUPPORT=$(use10 zstd)
)
tc-export CC
use debug && append-cppflags -DSQUASHFS_TRACE
}
src_compile() {
emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
}
src_install() {
dobin squashfs-tools/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
dodoc -r RELEASE-READMEs
doman manpages/*.1
dosym unsquashfs /usr/bin/sqfscat
dosym mksquashfs /usr/bin/sqfstar
}

View File

@ -1,57 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Tools to create and extract Squashfs filesystems"
HOMEPAGE="https://github.com/plougher/squashfs-tools/"
SRC_URI="
https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
-> ${P}.tar.gz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug lz4 lzma lzo xattr zstd"
DEPEND="
sys-libs/zlib
lz4? ( app-arch/lz4 )
lzma? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
xattr? ( sys-apps/attr )
zstd? ( app-arch/zstd )
"
RDEPEND=${DEPEND}
use10() {
usex "${1}" 1 0
}
src_compile() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
local opts=(
LZMA_XZ_SUPPORT=$(use10 lzma)
LZO_SUPPORT=$(use10 lzo)
LZ4_SUPPORT=$(use10 lz4)
XATTR_SUPPORT=$(use10 xattr)
XZ_SUPPORT=$(use10 lzma)
ZSTD_SUPPORT=$(use10 zstd)
)
tc-export CC
use debug && append-cppflags -DSQUASHFS_TRACE
emake "${opts[@]}" -C squashfs-tools
}
src_install() {
dobin squashfs-tools/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
doman manpages/*.1
dosym unsquashfs /usr/bin/sqfscat
dosym mksquashfs /usr/bin/sqfstar
}

View File

@ -1,57 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Tools to create and extract Squashfs filesystems"
HOMEPAGE="https://github.com/plougher/squashfs-tools/"
SRC_URI="
https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
-> ${P}.tar.gz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="debug lz4 lzma lzo xattr zstd"
DEPEND="
sys-libs/zlib
lz4? ( app-arch/lz4 )
lzma? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
xattr? ( sys-apps/attr )
zstd? ( app-arch/zstd )
"
RDEPEND=${DEPEND}
use10() {
usex "${1}" 1 0
}
src_compile() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
local opts=(
LZMA_XZ_SUPPORT=$(use10 lzma)
LZO_SUPPORT=$(use10 lzo)
LZ4_SUPPORT=$(use10 lz4)
XATTR_SUPPORT=$(use10 xattr)
XZ_SUPPORT=$(use10 lzma)
ZSTD_SUPPORT=$(use10 zstd)
)
tc-export CC
use debug && append-cppflags -DSQUASHFS_TRACE
emake "${opts[@]}" -C squashfs-tools
}
src_install() {
dobin squashfs-tools/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
doman manpages/*.1
dosym unsquashfs /usr/bin/sqfscat
dosym mksquashfs /usr/bin/sqfstar
}

View File

@ -1,57 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Tools to create and extract Squashfs filesystems"
HOMEPAGE="https://github.com/plougher/squashfs-tools/"
SRC_URI="
https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
-> ${P}.tar.gz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="debug lz4 lzma lzo xattr zstd"
DEPEND="
sys-libs/zlib
lz4? ( app-arch/lz4 )
lzma? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
xattr? ( sys-apps/attr )
zstd? ( app-arch/zstd )
"
RDEPEND=${DEPEND}
use10() {
usex "${1}" 1 0
}
src_compile() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
local opts=(
LZMA_XZ_SUPPORT=$(use10 lzma)
LZO_SUPPORT=$(use10 lzo)
LZ4_SUPPORT=$(use10 lz4)
XATTR_SUPPORT=$(use10 xattr)
XZ_SUPPORT=$(use10 lzma)
ZSTD_SUPPORT=$(use10 zstd)
)
tc-export CC
use debug && append-cppflags -DSQUASHFS_TRACE
emake "${opts[@]}" -C squashfs-tools
}
src_install() {
dobin squashfs-tools/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
doman Documentation/manpages/*.1
dosym unsquashfs /usr/bin/sqfscat
dosym mksquashfs /usr/bin/sqfstar
}

View File

@ -14,7 +14,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug lz4 lzma lzo xattr zstd"
DEPEND="

View File

@ -1,62 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Tools to create and extract Squashfs filesystems"
HOMEPAGE="https://github.com/plougher/squashfs-tools/"
SRC_URI="
https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
-> ${P}.tar.gz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="debug lz4 lzma lzo xattr zstd"
DEPEND="
sys-libs/zlib
lz4? ( app-arch/lz4 )
lzma? ( app-arch/xz-utils )
lzo? ( dev-libs/lzo )
xattr? ( sys-apps/attr )
zstd? ( app-arch/zstd )
"
RDEPEND=${DEPEND}
# https://bugs.gentoo.org/958646
PATCHES=(
"${FILESDIR}/${P}-missing-includes.patch"
)
use10() {
usex "${1}" 1 0
}
src_compile() {
# set up make command line variables in EMAKE_SQUASHFS_CONF
local opts=(
LZMA_XZ_SUPPORT=$(use10 lzma)
LZO_SUPPORT=$(use10 lzo)
LZ4_SUPPORT=$(use10 lz4)
XATTR_SUPPORT=$(use10 xattr)
XZ_SUPPORT=$(use10 lzma)
ZSTD_SUPPORT=$(use10 zstd)
)
tc-export CC
use debug && append-cppflags -DSQUASHFS_TRACE
emake "${opts[@]}" -C squashfs-tools
}
src_install() {
dobin squashfs-tools/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
doman Documentation/manpages/*.1
dosym unsquashfs /usr/bin/sqfscat
dosym mksquashfs /usr/bin/sqfstar
}