xz: Performance and compression tuning (V2) - fine tuning

[people/pmueller/ipfire-2.x.git] / lfs / core-updates

diff --git a/lfs/core-updates b/lfs/core-updates
index b40de13e06efffb68c984fc34e74c6d9c5132116..d3492696726578c4b015c06e407ea2a88ffeb444 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -26,8 +26,9 @@ include Config
 
 VER = ipfire
 
-THISAPP    = core-updates
-TARGET     = $(DIR_INFO)/$(THISAPP)
+THISAPP     = core-updates
+TARGET      = $(DIR_INFO)/$(THISAPP)
+TAR_OPTIONS = --xz
 
 ###############################################################################
 # Top-level Rules
@@ -56,10 +57,11 @@ core/%:
        eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
        #Generate ROOTFILES from filelists
-       $(DIR_SRC)/src/scripts/archive.files \
+       BUILD_ARCH=$(BUILD_ARCH) BUILDTARGET=$(BUILDTARGET) KVER=$(KVER) \
+               $(DIR_SRC)/src/scripts/archive.files \
                $(DIR_SRC)/config/rootfiles/$@/filelists \
                $(DIR_SRC)/config/rootfiles/$@/files \
-               $(DIR_SRC)/config/rootfiles/$@/files.$(MACHINE) \
+               $(DIR_SRC)/config/rootfiles/$@/files.$(BUILD_ARCH) \
                > /tmp/ROOTFILES.tmp
 
        #remove excluded files from ROOTFILES
@@ -77,7 +79,7 @@ core/%:
        mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
        tar -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
-       cd /tmp && tar cJf /install/packages/package/files.tar.xz * && rm -rf *
+       cd /tmp && XZ_OPT="$(XZ_OPT)" tar cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf *
        cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
        rm /install/packages/package/ROOTFILES
        mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
@@ -88,7 +90,7 @@ core/%:
        #Change xxxKVERxxx to Kernelversion
        sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
 
-       cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \
+       cd /install/packages/package && XZ_OPT="$(XZ_OPT)" tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire $(TAR_OPTIONS) \
                update.sh files.tar.xz ROOTFILES
        rm -rf /install/packages/package
        sed -e "s/NAME/core-upgrade/g" \