mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
cdrom: Change format to XZ and compress in parallel
This allows us to use all processor cores to compress the image faster. Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
@@ -32,9 +32,12 @@ TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
ifeq "$(BUILD_PLATFORM)" "arm"
|
||||
TAR_OPTIONS =
|
||||
else
|
||||
TAR_OPTIONS = --lzma
|
||||
TAR_OPTIONS = --xz
|
||||
endif
|
||||
|
||||
# Enable multi-threaded compression for LZMA
|
||||
export XZ_OPT = --threads=0
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
@@ -137,7 +137,7 @@ endif
|
||||
|
||||
# Install IPFire
|
||||
ifneq "$(BUILD_PLATFORM)" "arm"
|
||||
tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img
|
||||
tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
|
||||
else
|
||||
tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
|
||||
endif
|
||||
|
||||
@@ -778,7 +778,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
// Extract files...
|
||||
snprintf(commandstring, STRING_SIZE,
|
||||
"/bin/tar -C /harddisk -xvf /cdrom/distro.img --lzma 2>/dev/null");
|
||||
"/bin/tar -C /harddisk -xvf /cdrom/distro.img --xz 2>/dev/null");
|
||||
|
||||
if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
|
||||
_("Installing the system..."), logfile)) {
|
||||
|
||||
Reference in New Issue
Block a user