X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=170f860c7b8f2029385acfda7835e197ce690ced;hp=940883e2db61b84017445d2cf34b655c8e9049a4;hb=aee3027d875826e18b3eb198f9ad0c3228bfbb01;hpb=e9a97e8e81ecad18be1c6b42995c4afc8c271886

diff --git a/lfs/Config b/lfs/Config
index 940883e2db..170f860c7b 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -13,16 +13,8 @@
 # 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://switch.dl.sourceforge.net/sourceforge
-URL_IPFIRE  = http://mirror.ipfire.org/source-packages
+URL_IPFIRE  = http://source.ipfire.org/othersrc
+URL_TOOLCHAIN = http://source.ipfire.org/toolchain
 URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.
@@ -47,10 +39,11 @@ DIR_SRC = $(ROOT)/usr/src
 #
 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
@@ -72,6 +65,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)))+' Makefile; \
+		else \
+			cd $(DIR_SRC)/linux-$(KVER) && \
+				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-smp+' Makefile; \
+		fi; \
+	fi
 endef
 else
 define PREBUILD
@@ -83,27 +87,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 -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
@@ -129,4 +152,33 @@ 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
+	# 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
+	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