Fix logfile generation if filenames contain + or space

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

diff --git a/lfs/Config b/lfs/Config
index 86c5fdf0a79bd457a50fd7436bcd8dc2fda724d5..d6dc30a4313369fc042cac778019867f967d9800 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_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.
 #
@@ -135,12 +136,14 @@ define POSTBUILD
                        echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
                fi; \
                sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+               IFS=`echo`; \
                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; \
+               unset IFS; \
                rm -f $(TARGET)_rootfile; \
        else \
                touch $(TARGET); \
@@ -162,7 +165,7 @@ endef
 
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
-       wget -T 60 -t 1 -c -nv -U "IPFireSourceGrabber/2.x" $($(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