From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 17:46:48 +0000 (+0000)
Subject: make.sh: Correctly pass ZSTD_OPT
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=547a04c0dcd01e1878fcdab405690ca907e5fbf6;p=people%2Fms%2Fipfire-2.x.git

make.sh: Correctly pass ZSTD_OPT

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/Config b/lfs/Config
index ac06ce576..71abb8b85 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -33,6 +33,7 @@
 # Cleanup environment from any variables
 unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
 unexport XZ_OPT
+unexport ZSTD_OPT
 
 # Basic Variables
 EMPTY :=
@@ -71,11 +72,6 @@ TAR_OPTIONS = \
 	--xattrs-include='*' \
 	--sparse
 
-ZSTD_OPTIONS = \
-	-T$(PARALLELISM) \
-	-19 \
-	--long
-
 # URLs that are common sources of downloads.  If you're having trouble with
 # a site you should change its URL to that of a suitable mirror site.
 #
diff --git a/make.sh b/make.sh
index 18ed45310..3c89f0e69 100755
--- a/make.sh
+++ b/make.sh
@@ -583,6 +583,7 @@ execute() {
 
 		# Compression Options
 		[XZ_OPT]="${XZ_OPT[@]}"
+		[ZSTD_OPT]="${ZSTD_OPT[@]}"
 
 		# Build Architecture
 		[BUILD_ARCH]="${BUILD_ARCH}"