mrrl

commit af68d8754deb226f257e0ae6cf168ff7f6ff0a28
parent 9bef1e304b64c68cc2b42c04a8ff8d044b1d5678
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu,  6 Nov 2025 01:20:06 +0000

squashfs-tools

Diffstat:
M
templates/pkg/squashfs-tools
 | 
39
++++++++++++++++++++-------------------
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/squashfs-tools
 | 
41
+++++++++++++++++++++--------------------
M
variants/ccx-x86_64/userspace.environment
 | 
4
++--
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/squashfs-tools
 | 
41
+++++++++++++++++++++--------------------
M
variants/root-x86_64/userspace.environment
 | 
4
++--

7 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/templates/pkg/squashfs-tools b/templates/pkg/squashfs-tools
@@ -11,27 +11,28 @@
 {% endblock package_deps %}
 {% block build %}
 build_env_static
-make -C squashfs-tools \
-	GZIP_SUPPORT=1  \
-	XZ_SUPPORT=0  \
-	LZO_SUPPORT=0  \
-	LZ4_SUPPORT=0  \
-	ZSTD_SUPPORT=1  \
-	COMP_DEFAULT=zstd  \
-	XATTR_SUPPORT=1  \
-	XATTR_OS_SUPPORT=1  \
-	XATTR_DEFAULT=1  \
-	USE_PREBUILT_MANPAGES=y  \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1"
+m() {
+	{{make}} -C squashfs-tools \
+		GZIP_SUPPORT=1  \
+		XZ_SUPPORT=0  \
+		LZO_SUPPORT=0  \
+		LZ4_SUPPORT=0  \
+		ZSTD_SUPPORT=1  \
+		COMP_DEFAULT=zstd  \
+		XATTR_SUPPORT=1  \
+		XATTR_OS_SUPPORT=1  \
+		XATTR_DEFAULT=1  \
+		USE_PREBUILT_MANPAGES=y  \
+		INSTALL_PREFIX="$prefix"  \
+		INSTALL_DIR="$prefix/command"  \
+		INSTALL_MANPAGES_DIR="$prefix/man/man1" \
+		"$@"
+}
+
+m
 {% endblock build %}
 {% block install %}
-make -C squashfs-tools \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1" \
-	install
+m install
 {% endblock install %}
 {% block check %}
 check_static command/mksquashfs
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -40,7 +40,7 @@
 #+mlog.ad83d1e085e275eeaecdb817e532119817b7dcb35ecf475b413ecb3a14f0acdd
 #+findutils.f7e98e991b4780b47ce6d2ab429158d542f7185606022a40324ecbb4e4057b5e
 #+nawk.20e61757d30ba2271f207e142d393eb446a3ce4af79060fea9822a996e9eee29
-#+squashfs-tools.5d359a10529616304c5efa5bf4dfd3b3549e28f163ae32f55887d3a1c667de72
+#+squashfs-tools.58c1c8ac22cdd38c6dbbad16a6102cfdb9fd0c580c152b7e7ba6c6b584d597fd
 #+system-config.e34a10a246e11b5f6af2a9124655b668728d8b356a4387a427eb51d977b224d6
 #+system-config-rc.6545fdd57602332bba6046e46bcdbd4ab5aa57e49cc8fac0ed5976d09ccde556
 #+system-config-scripts.1a9ea91106c0a3f813a9cf909962f3e6b4be7ec9f9a140df9a04ce2c14745d7e
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -40,26 +40,27 @@ cd 'squashfs-tools-4.7.2'
 
 
 build_env_static
-make -C squashfs-tools \
-	GZIP_SUPPORT=1  \
-	XZ_SUPPORT=0  \
-	LZO_SUPPORT=0  \
-	LZ4_SUPPORT=0  \
-	ZSTD_SUPPORT=1  \
-	COMP_DEFAULT=zstd  \
-	XATTR_SUPPORT=1  \
-	XATTR_OS_SUPPORT=1  \
-	XATTR_DEFAULT=1  \
-	USE_PREBUILT_MANPAGES=y  \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1"
-
-make -C squashfs-tools \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1" \
-	install
+m() {
+	make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C squashfs-tools \
+		GZIP_SUPPORT=1  \
+		XZ_SUPPORT=0  \
+		LZO_SUPPORT=0  \
+		LZ4_SUPPORT=0  \
+		ZSTD_SUPPORT=1  \
+		COMP_DEFAULT=zstd  \
+		XATTR_SUPPORT=1  \
+		XATTR_OS_SUPPORT=1  \
+		XATTR_DEFAULT=1  \
+		USE_PREBUILT_MANPAGES=y  \
+		INSTALL_PREFIX="$prefix"  \
+		INSTALL_DIR="$prefix/command"  \
+		INSTALL_MANPAGES_DIR="$prefix/man/man1" \
+		"$@"
+}
+
+m
+
+m install
 
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -40,4 +40,4 @@
 #+mlog.ad83d1e085e275eeaecdb817e532119817b7dcb35ecf475b413ecb3a14f0acdd
 #+findutils.f7e98e991b4780b47ce6d2ab429158d542f7185606022a40324ecbb4e4057b5e
 #+nawk.20e61757d30ba2271f207e142d393eb446a3ce4af79060fea9822a996e9eee29
-#+squashfs-tools.5d359a10529616304c5efa5bf4dfd3b3549e28f163ae32f55887d3a1c667de72-
\ No newline at end of file
+#+squashfs-tools.58c1c8ac22cdd38c6dbbad16a6102cfdb9fd0c580c152b7e7ba6c6b584d597fd+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -40,7 +40,7 @@
 #+mlog.154ac4db8c95c0affea4172e4d72078e695e9cb453617fd1a22c94f22b68861f
 #+findutils.d795ff8ec37213251f193277c6552c7af4167ee72e85afde54bd4fc8f8f6d843
 #+nawk.2a62eb4547baabf59f72cd608b89989dd042746b3b8d7380af7b64460ae0d46b
-#+squashfs-tools.c90a2925e44fe0ceb74a22bbd3cf73adbe33da8f40eca5e593999400127538b8
+#+squashfs-tools.fe106af0c3de1dfc99739e98cc2c827cbcc528c4fff1bb9566c6d83a6135d81b
 #+system-config.fe772b12e2a1128b62c27e31c24460cf067c9bac36e123bd87acd8e8ea3b46dc
 #+system-config-rc.d7f41da7298770784df5f59c77b4e74547debd2bf7a453dadd774945a7a6c1bc
 #+system-config-scripts.213e9ff4676978932ba05a45f6e2cbc34efc3db67fb7e848268d6c3c132837e4
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -40,26 +40,27 @@ cd 'squashfs-tools-4.7.2'
 
 
 build_env_static
-make -C squashfs-tools \
-	GZIP_SUPPORT=1  \
-	XZ_SUPPORT=0  \
-	LZO_SUPPORT=0  \
-	LZ4_SUPPORT=0  \
-	ZSTD_SUPPORT=1  \
-	COMP_DEFAULT=zstd  \
-	XATTR_SUPPORT=1  \
-	XATTR_OS_SUPPORT=1  \
-	XATTR_DEFAULT=1  \
-	USE_PREBUILT_MANPAGES=y  \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1"
-
-make -C squashfs-tools \
-	INSTALL_PREFIX="$prefix"  \
-	INSTALL_DIR="$prefix/command"  \
-	INSTALL_MANPAGES_DIR="$prefix/man/man1" \
-	install
+m() {
+	make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C squashfs-tools \
+		GZIP_SUPPORT=1  \
+		XZ_SUPPORT=0  \
+		LZO_SUPPORT=0  \
+		LZ4_SUPPORT=0  \
+		ZSTD_SUPPORT=1  \
+		COMP_DEFAULT=zstd  \
+		XATTR_SUPPORT=1  \
+		XATTR_OS_SUPPORT=1  \
+		XATTR_DEFAULT=1  \
+		USE_PREBUILT_MANPAGES=y  \
+		INSTALL_PREFIX="$prefix"  \
+		INSTALL_DIR="$prefix/command"  \
+		INSTALL_MANPAGES_DIR="$prefix/man/man1" \
+		"$@"
+}
+
+m
+
+m install
 
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -40,4 +40,4 @@
 #+mlog.154ac4db8c95c0affea4172e4d72078e695e9cb453617fd1a22c94f22b68861f
 #+findutils.d795ff8ec37213251f193277c6552c7af4167ee72e85afde54bd4fc8f8f6d843
 #+nawk.2a62eb4547baabf59f72cd608b89989dd042746b3b8d7380af7b64460ae0d46b
-#+squashfs-tools.c90a2925e44fe0ceb74a22bbd3cf73adbe33da8f40eca5e593999400127538b8-
\ No newline at end of file
+#+squashfs-tools.fe106af0c3de1dfc99739e98cc2c827cbcc528c4fff1bb9566c6d83a6135d81b+
\ No newline at end of file