From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 14 Apr 2009 20:29:56 +0000 (+0200)
Subject: Fix logfile generation if filenames contain + or space
X-Git-Tag: v2.5-beta1~29
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c9444dcf3b11f8be5f0831d6dcfede3a7efefb83

Fix logfile generation if filenames contain + or space
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b1e4abc282..569db0fb9d 100644
--- 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 9c331abf0d..d6dc30a431 100644
--- 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); \