X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=109eec3693c691d087b9a8c6b9c564089eacd77a;hp=7f3cf2beaac30e3a82d28ba85b3f3708850f642f;hb=b72fd0e40464042bd2ad2614d24f2ac60e7d043d;hpb=a8b159e729afb532d289fce4d398b728b9f2f75c

diff --git a/lfs/Config b/lfs/Config
index 7f3cf2beaa..109eec3693 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -10,20 +10,31 @@
 # 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_CPAN    = http://www.cpan.org/modules/by-module
-URL_AGNU    = ftp://alpha.gnu.org/gnu
-URL_DEBIAN  = http://http.us.debian.org/debian/pool/main
-URL_GNU     = http://ftp.gnu.org/gnu
-URL_KERNEL  = http://www.kernel.org/pub
-URL_TUE     = ftp://ftp.win.tue.nl/pub
-URL_LFS_FTP = http://ftp.at.linuxfromscratch.org/pub/lfs/lfs-packages/5.1.1
-URL_LFS     = http://www.linuxfromscratch.org/patches/downloads
-URL_SFNET   = http://kent.dl.sourceforge.net/sourceforge
-URL_IPFIRE  = http://mirror.ipfire.org/source
-URL_IPCOP   = http://ipcop.ath.cx
+URL_IPFIRE  = http://source.ipfire.org/othersrc
+URL_TOOLCHAIN = http://source.ipfire.org/toolchains
 
 # Default compiler optimizations.
 #
@@ -49,9 +60,9 @@ DIR_DL      = $(LFS_BASEDIR)/cache
 DIR_CHK     = $(LFS_BASEDIR)/cache/check
 DIR_CONF    = $(LFS_BASEDIR)/config
 DIR_INFO    = $(LFS_BASEDIR)/log
-DIR_TMP     = /var/tmp
+DIR_TMP     = /tmp
 
-KGCC = ccache /usr/bin/gcc
+KGCC = gcc
 
 ###############################################################################
 # Common Macro Definitions
@@ -73,6 +84,17 @@ define PREBUILD
 	echo "====================================== Installing $(THISAPP) ..."
 	@echo "Install started; saving file list to $(DIR_SRC)/lsalr ..."
 	@if [ ! -f $(DIR_SRC)/lsalr ]; then $(FIND_FILES) > $(DIR_SRC)/lsalr; fi
+	# 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)))-ipfire+' Makefile; \
+		else \
+			cd $(DIR_SRC)/linux-$(KVER) && \
+				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \
+		fi; \
+	fi
 endef
 else
 define PREBUILD
@@ -84,27 +106,46 @@ endif
 #
 ifeq "$(ROOT)" ""
 define POSTBUILD
-	@echo "Install done; saving file list to $(DIR_INFO)/$(THISAPP) ..."
+	@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)_1
+	@diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_diff
 	@cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
 	@rm -f $(DIR_SRC)/lsalrnew
-	sed -i -e 's+.\/++' $(TARGET)_1
+	sed -i -e 's+.\/++' $(TARGET)_diff
 	# compare roofile ( same name as lfs script) with the list of installed files
 	# special cases
-	# - on a partial rebuild without a new file inside TARGET_1, just touch TARGET
-	if [ -s "$(TARGET)_1" ]; then \
-		ROOTFILE=$(DIR_SRC)/src/ROOTFILES.$(MACHINE); \
-		for line in `cat $(TARGET)_1`; do \
-			if grep -qE "^#$$line$$" $$ROOTFILE ; then echo "#$$line" >> $(TARGET); \
-			elif grep -qE "^$$line$$" $$ROOTFILE ; then echo "$$line" >> $(TARGET); \
+	# - if the corresponding rootfile is not found, touch $(TARGET)_missing_rootfile
+	# - on a partial rebuild without a new file inside TARGET_diff, just touch TARGET
+	# $(TARGET)_diff : result of the diff
+	# ROOTFILE : reference of include/exclude files
+	# $(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; \
+		echo $(LFS_SCRIPT); \
+		ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common $(DIR_SRC)/config/rootfiles/packages -maxdepth 1 -type f -name $$LFS_SCRIPT`; \
+		if [ "$$ROOTFILE" = "" ]; then \
+			ROOTFILE=`find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -type f -name $$LFS_SCRIPT`; \
+		fi; \
+		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; \
+		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); \
 			else echo "+$$line" >> $(TARGET); \
 			fi; \
 		done; \
+		rm -f $(TARGET)_rootfile; \
 	else \
 		touch $(TARGET); \
 	fi
-	@rm -f $(TARGET)_1
+	@rm -f $(TARGET)_diff
 endef
 else
 define POSTBUILD
@@ -130,20 +171,31 @@ define MD5
 	# error mean file signature don't match the one in lfs script
 	[ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
 	echo "$@ checksum OK"
+	echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log
 endef
 
 define PAK
-	@rm -rf /install/packages/package /tmp/* /packagetmp.tar
-	cd /
-	mkdir -p  /install/packages/package
-	cp -f $(DIR_SRC)/src/paks/$(PROG)/{,un}install.sh /install/packages/package
-	cp -f $(DIR_SRC)/src/paks/$(PROG)/ROOTFILES       /install/packages/package
-	chmod 755 /install/packages/package/{,un}install.sh
-	tar --create -C / --files-from=/install/packages/package/ROOTFILES -f /packagetmp.tar --exclude='#*'
-	tar -x -C /tmp -f /packagetmp.tar
-	@rm -f /packagetmp.tar
-	@cd /tmp && tar zcf /install/packages/package/files.tgz * && rm -rf *
-	cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES && tar cfz ../$(THISAPP)-$(PAK_VER).tar.gz files.tgz install.sh uninstall.sh ROOTFILES
-	cd /install/packages && md5sum $(THISAPP)-$(PAK_VER).tar.gz > $(THISAPP)-$(PAK_VER).tar.gz.md5
+	# Bringing the files to their right place.
 	@rm -rf /install/packages/package
+	@mkdir -p /install/packages/package
+	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
+	sed -e "s/KVER/$(KVER)/g" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES 
+	chmod 755 /install/packages/package/{{,un}install,update}.sh
+	cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
+		--preserve --numeric-owner
+	-cat /install/packages/package/ROOTFILES | grep -v "#" > /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/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
+	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef