Compress flash-images as XZ as well

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

diff --git a/lfs/flash-images b/lfs/flash-images
index 57d600cf0cd2ea42ffbd4907b5a34266246b48eb..a5a3c29ceeaa62f33e911a90c3b7c055b1fac4ed 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -33,7 +33,7 @@ DEVICE     = $(shell losetup -f)
 PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
+IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 
@@ -214,5 +214,5 @@ ifeq "$(BUILD_PLATFORM)" "arm"
 endif
 
        # Compress Image
-       pigz -f9 < $(IMG) > $(IMAGE_FILE)
+       xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
        rm -rf $(IMG) $(MNThdd)

diff --git a/make.sh b/make.sh
index 9893fbb20e5a0099510445c8a0094f65e5019e56..818d3aa09d8c692835a08046620b3af79893f9d0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1573,7 +1573,7 @@ buildpackages() {
        lfsmake2 flash-images
   fi
 
-  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages