This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 5fd54721c2275def506ac54cc2e4e810f57fa491 (commit) via c061d66fca5e252dab8fa2e5be5c684faeec75e0 (commit) via bc9544929c61080e662d8668d5ea0b833965fdd9 (commit) from 1c1babf44bf3524726c098d787e4a01eb81950d6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 5fd54721c2275def506ac54cc2e4e810f57fa491 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 15:23:26 2017 +0100
Use best XZ compression for smaller images and packages
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c061d66fca5e252dab8fa2e5be5c684faeec75e0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 14:58:52 2017 +0100
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
commit bc9544929c61080e662d8668d5ea0b833965fdd9 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 17 14:58:28 2017 +0100
packages: Compress in parallel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/Config | 2 +- lfs/cdrom | 5 ++++- lfs/flash-images | 2 +- src/installer/main.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-)
Difference in files: diff --git a/lfs/Config b/lfs/Config index b961db9..d2ac8e4 100644 --- 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 - cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz * + cd /install/packages/package/tmp/ && XZ_OPT="-T0 --best" 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 diff --git a/lfs/cdrom b/lfs/cdrom index 58e754f..2f15103 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -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 --best + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/flash-images b/lfs/flash-images index 8ed7f63..a75d711 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -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 diff --git a/src/installer/main.c b/src/installer/main.c index e9517e2..a364255 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -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)) {
hooks/post-receive -- IPFire 2.x development tree