]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - lfs/Config
Fixed all those tar --preserve errors present.
[people/pmueller/ipfire-2.x.git] / lfs / Config
index 8e5c1e14ab14054a264d9da4427586f466c33b30..bc9375ac638c181a3d5b72086a768af0975ae7d7 100644 (file)
@@ -88,12 +88,12 @@ define PREBUILD
        # Fix installation on partial rebuild, so modules install where they should
        # and not everytime on the last compiled kernel
        if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
-               if [ "$(SMP)" = "" ]; then \
+               if [ "$(XEN)" = "" ]; then \
                        cd $(DIR_SRC)/linux-$(KVER) && \
                                sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
                else \
                        cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \
+                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-xen+' Makefile; \
                fi; \
        fi
 endef
@@ -122,7 +122,7 @@ define POSTBUILD
        # $(TARGET)_rootfile : ROOTFILE with KVER replacement
        # $(TARGET) : log result with {commented|include|added} files
        if [ -s "$(TARGET)_diff" ]; then \
-               if [ "$(PASS)" = "SMP" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-smp; \
+               if [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
                else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
                fi; \
                echo $(LFS_SCRIPT); \
@@ -194,12 +194,12 @@ define PAK
        sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
        chmod 755 /install/packages/package/{{,un}install,update}.sh
        cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
-               --preserve --numeric-owner
+               -p --numeric-owner
        # Double tar to remove double files
        tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
-               --preserve --numeric-owner
+               -p --numeric-owner
        rm -f /install/packages/package/files.tmp
-       cd /install/packages/package/tmp/ && tar -c --preserve --numeric-owner -f /install/packages/package/files *             
+       cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -f /install/packages/package/files *             
        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