X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2FConfig;h=01b9cf1c92bb7661fa2ad17135936230a00e7709;hb=3c43cafe14ff93fa92932d0895cb4ba7e3d25e83;hp=aeb5325bbd89815e44b947986169db411f0f4a50;hpb=e99d32db30ff55cba3d78f5e32de9dac50e935a7;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/Config b/lfs/Config
index aeb5325bbd..01b9cf1c92 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -35,6 +35,7 @@
 #
 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.
 #
@@ -74,7 +75,7 @@ KGCC = gcc
 define FIND_FILES
 	cd $(ROOT)/ && find -mount \
 	-not -path './tools*' -not -path './tmp*' -not -path './usr/src*' \
-	-not -path './dev*' -not -path './proc*' -not -path './install*'
+	-not -path './dev*' -not -path './proc*' -not -path './install*' | sort
 endef
 
 # This is common starting logic for builds.
@@ -87,12 +88,15 @@ 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 [ "$(PAE)" = "1" ]; then \
+			cd $(DIR_SRC)/linux-$(KVER) && \
+				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-pae+' Makefile; \
+		elif [ "$(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
@@ -108,7 +112,7 @@ ifeq "$(ROOT)" ""
 define POSTBUILD
 	@echo "Install done; saving file list to $(TARGET) ..."
 	@$(FIND_FILES) > $(DIR_SRC)/lsalrnew
-	@diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_diff
+	@diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
 	@cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
 	@rm -f $(DIR_SRC)/lsalrnew
 	sed -i -e 's+.\/++' $(TARGET)_diff
@@ -121,7 +125,8 @@ 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 [ "$(PAE)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-pae; \
+		elif [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
 		else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
 		fi; \
 		echo $(LFS_SCRIPT); \
@@ -136,11 +141,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); \
@@ -189,12 +198,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