X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=7360ac675ecee54f2784cfc72578cef194477c60;hp=33dc3c4fcdcd1ea813e19bd56b488bdab5dd8c52;hb=68a3ec7d6a25ba4bde14e886889c28bd4a3841ff;hpb=cab737ed73b9136696cb457978f9dad989c80387

diff --git a/lfs/Config b/lfs/Config
index 33dc3c4fcd..7360ac675e 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -10,18 +10,32 @@
 # found at http://www.opensource.org/licenses/artistic-license.html.          #
 ###############################################################################
 
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
 # 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_IPCOP   = http://ipcop.ath.cx
-
-# Default compiler optimizations.
-#
-FLAGS_OPT   = -O2
-FLAGS_CPU   = -mcpu=$(MACHINE)
-FLAGS_ARCH  = -march=$(MACHINE)
+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
 
 # Don't change this; it will be overridden by other makefiles where necessary.
 #
@@ -55,7 +69,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.
@@ -68,13 +82,8 @@ 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 \
-			cd $(DIR_SRC)/linux-$(KVER) && \
-				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))+' Makefile; \
-		else \
-			cd $(DIR_SRC)/linux-$(KVER) && \
-				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-smp+' Makefile; \
-		fi; \
+		cd $(DIR_SRC)/linux-$(KVER) && \
+			sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire$(KCFG)+' Makefile; \
 	fi
 endef
 else
@@ -87,9 +96,11 @@ endif
 #
 ifeq "$(ROOT)" ""
 define POSTBUILD
+	@echo "Updating linker cache..."
+	@type -p ldconfig >/dev/null && ldconfig || :
 	@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
@@ -102,26 +113,25 @@ 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; \
-		else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
-		fi; \
+		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
 		echo $(LFS_SCRIPT); \
-		ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f -name $$LFS_SCRIPT`; \
-		if [ "$$ROOTFILE" = "" ]; then \
-			ROOTFILE=`find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -type f -name $$LFS_SCRIPT`; \
-		fi; \
+		ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(MACHINE),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
 		if [ "$$ROOTFILE" = "" ]; then \
 			touch $(TARGET)_missing_rootfile; \
 			ROOTFILE=$(TARGET)_missing_rootfile ; \
 			echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
 		fi; \
-		sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+		sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/MACHINE/$(MACHINE)/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); \
@@ -137,13 +147,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
@@ -157,28 +167,40 @@ endef
 
 define PAK
 	# Bringing the files to their right place.
-	@rm -rf /install/packages/package /tmp/* /packagetmp.tar
-	@mkdir -p /install/packages/package
-	@cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /install/packages/package
-	@cp -f /usr/src/src/paks/$(PROG)/update.sh /install/packages/package
-	@cp -f /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
-	@chmod 755 /install/packages/package/{,un}install.sh
-	cd / && tar --create --directory=/ --files-from=/install/packages/package/ROOTFILES \
-	        --file=/packagetmp.tar --exclude='#*'
-	cd / && tar -x -C /tmp -f /packagetmp.tar
-	rm -f /packagetmp.tar
-	-cd /tmp && tar cjvf /install/packages/package/files.tbz2 *
-	cd / && rm -rf /tmp/*
-	cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-	cd /install/packages/package && tar cfj ../$(PROG)-$(VER)-$(PAK_VER).ipfire \
-			files.tbz2 install.sh uninstall.sh update.sh ROOTFILES
+	@rm -rf /install/packages/package
+	@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
+	for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
+		if [ -e "$${i}" ]; then \
+			cp -v $${i} /install/packages/package/ROOTFILES; \
+			break; \
+		fi; \
+	done
+	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
+	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
+	chmod 755 /install/packages/package/{{,un}install,update}.sh
+	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 \
 			-e s/VER/$(VER)/g \
 			-e s/RELEASE/$(PAK_VER)/g \
 			-e s/DEPS/$(DEPS)/g \
-			-e s/DESCDE/$(DESCDE)/g \
-			-e s/DESCEN/$(DESCEN)/g \
 			-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
 	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef