Fixed all those tar --preserve errors present.

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

diff --git a/lfs/Config b/lfs/Config
index afa3a17cba078ee8c23735d0e90da8ef0f917135..bc9375ac638c181a3d5b72086a768af0975ae7d7 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -33,8 +33,9 @@
 # URLs that are common sources of downloads.  If you're having trouble with
 # a site you should change its URL to that of a suitable mirror site.
 #
-URL_IPFIRE  = http://source.ipfire.org/othersrc
-URL_TOOLCHAIN = http://source.ipfire.org/toolchain
+URL_IPFIRE  = http://source.ipfire.org/source-2.x
+URL_TOOLCHAIN = http://source.ipfire.org/toolchains
+URL_SOURCE = source.ipfire.org:/pub/source/source-2.x
 
 # Default compiler optimizations.
 #
@@ -87,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
@@ -121,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); \
@@ -136,11 +137,15 @@ define POSTBUILD
                fi; \
                sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \
                for line in `cat $(TARGET)_diff`; do \
-                       if grep -qE "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
-                       elif grep -qE "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
+                       if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
+                       elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
                        else echo "+$$line" >> $(TARGET); \
                        fi; \
                done; \
+               for line in `grep -v "^#" $(TARGET)_rootfile`; do \
+                       if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \
+                       fi; \
+               done; \
                rm -f $(TARGET)_rootfile; \
        else \
                touch $(TARGET); \
@@ -156,13 +161,13 @@ endif
 
 define CHECK
        @echo -e "$(MESSAGE)Check: $($(notdir $@))"
-       wget -T 120 -t 1 --spider -nv $($(notdir $@)) -O /dev/null
+       wget -T 120 -t 1 --spider -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O /dev/null
        @touch $(DIR_CHK)/$(notdir $@)
 endef
 
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
-       wget -T 60 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
+       wget -T 60 -t 1 -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
        [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
        mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
 endef
@@ -177,18 +182,27 @@ endef
 define PAK
        # Bringing the files to their right place.
        @rm -rf /install/packages/package
-       @mkdir -p /install/packages/package
-       if [ -e "/usr/src/src/paks $(PROG)" ]; then \
+       @mkdir -p /install/packages/package/tmp
+       if [ -e "/usr/src/src/paks/$(PROG)" ]; then \
                cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \
                /install/packages/package; \
        else \
                cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
                /install/packages/package; \
        fi
-       sed -e "s/KVER/$(KVER)/g" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES 
+       cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+       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 --files-from=/install/packages/package/ROOTFILES --exclude='#*'
-       -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES 
+       cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
+               -p --numeric-owner
+       # Double tar to remove double files
+       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 -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
        cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files
        rm -rf /install/packages/package
        sed -e s/NAME/$(PROG)/g \