Fix logfile generation if filenames contain + or space

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b1e4abc282a69a8a526f86c873300e4a15f91d89..569db0fb9d1ce51bb2db89328dccb687b98b3a70 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -51,7 +51,7 @@
 * bc-1.06
 * beep-1.2.2
 * bind-9.3.2
-* binutils-2.16.1
+* binutils-2.17
 * bison-2.2
 * bluez-libs-3.36
 * br2684ctl

diff --git a/lfs/Config b/lfs/Config
index 9c331abf0d882ff82805f070c83481e3980bbca4..d6dc30a4313369fc042cac778019867f967d9800 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -136,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); \