webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

cdrom: Change format to XZ and compress in parallel

Browse Source 
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:
Michael Tremer
2017-10-17 14:58:52 +01:00
parent bc9544929c
commit c061d66fca
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/cdrom
View File

@@ -32,9 +32,12 @@ TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(BUILD_PLATFORM)" "arm" ifeq "$(BUILD_PLATFORM)" "arm"
TAR_OPTIONS = TAR_OPTIONS =
else else
TAR_OPTIONS = --lzma TAR_OPTIONS = --xz
endif endif
# Enable multi-threaded compression for LZMA
export XZ_OPT = --threads=0
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################

2
lfs/flash-images
View File

@@ -137,7 +137,7 @@ endif
# Install IPFire # Install IPFire
ifneq "$(BUILD_PLATFORM)" "arm" 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 else
tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
endif endif

2
src/installer/main.c
View File

@@ -778,7 +778,7 @@ int main(int argc, char *argv[]) {
// Extract files... // Extract files...
snprintf(commandstring, STRING_SIZE, 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, if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
_("Installing the system..."), logfile)) { _("Installing the system..."), logfile)) {