X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=a216479f41468b440fb22b0c957c80c93ecb7160;hp=fd34ebf91c8d3e497a8a8ee80de4b09b1df3b114;hb=1ec8fd9906885f45dfe6df05857a98315f20950d;hpb=99e6df8e99db74a51c7d48e00c54f6dd834a9b97

diff --git a/lfs/Config b/lfs/Config
index fd34ebf91c..a216479f41 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -10,11 +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_IPFIRE  = http://source.ipfire.org/othersrc
-URL_TOOLCHAIN = http://source.ipfire.org/toolchain
+URL_TOOLCHAIN = http://source.ipfire.org/toolchains
 
 # Default compiler optimizations.
 #
@@ -69,10 +89,10 @@ define PREBUILD
 	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; \
+				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)))-smp+' Makefile; \
+				sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \
 		fi; \
 	fi
 endef
@@ -105,7 +125,7 @@ define POSTBUILD
 		else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
 		fi; \
 		echo $(LFS_SCRIPT); \
-		ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f -name $$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; \
@@ -157,20 +177,33 @@ endef
 define PAK
 	# Bringing the files to their right place.
 	@rm -rf /install/packages/package
-	@mkdir -p /install/packages/package
-	cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \
-		/install/packages/package
-	-grep -v "#" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES
+	@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
+	cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+	sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
 	chmod 755 /install/packages/package/{{,un}install,update}.sh
-	cd / && tar cvf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*'
+	cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
+		--preserve --numeric-owner
+	# Double tar to remove double files
+	tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
+		--preserve --numeric-owner
+	rm -f /install/packages/package/files.tmp
+	cd /install/packages/package/tmp/ && tar -c --preserve --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