Revert "Use best XZ compression for smaller images and packages"

This reverts commit 5fd54721c2275def506ac54cc2e4e810f57fa491.

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

diff --git a/lfs/Config b/lfs/Config
index d2ac8e4237633b7ec96bda6605bcadefad545204..1077f25545e42421650803b9ef33166c120eb248 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -204,7 +204,7 @@ define PAK
        tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
                -p --numeric-owner
        rm -f /install/packages/package/files.tmp
        tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
                -p --numeric-owner
        rm -f /install/packages/package/files.tmp

-       cd /install/packages/package/tmp/ && XZ_OPT="-T0 --best" tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz *
+       cd /install/packages/package/tmp/ && XZ_OPT=-T0 tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz *

        rm -r /install/packages/package/tmp
        -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
        mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
        rm -r /install/packages/package/tmp
        -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
        mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES

diff --git a/lfs/cdrom b/lfs/cdrom
index 2f151037aff5cfbe6a780e19c7d92622c84da01c..7a7fff166d752c051e76e22477858314cb9fd2fb 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -36,7 +36,7 @@ else
 endif
 
 # Enable multi-threaded compression for LZMA
 endif
 
 # Enable multi-threaded compression for LZMA

-export XZ_OPT = --threads=0 --best
+export XZ_OPT = --threads=0

 
 ###############################################################################
 # Top-level Rules
 
 ###############################################################################
 # Top-level Rules