X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2FConfig;h=9c331abf0d882ff82805f070c83481e3980bbca4;hb=0d0a7614a322647f1685d7458f36aa5691823b3f;hp=3ec7cb820ce25c7228c26f146595c7ca4a4adec5;hpb=5bd13f01482a0e25bd279d056a61e448d6778e59;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/Config b/lfs/Config index 3ec7cb820c..9c331abf0d 100644 --- a/lfs/Config +++ b/lfs/Config @@ -10,21 +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 . # +# # +############################################################################### + # 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://source.ipfire.eu/othersrc -URL_TOOLCHAIN = http://source.ipfire.eu/toolchain -URL_IPCOP = http://ipcop.ath.cx +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. # @@ -50,7 +61,7 @@ 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 = gcc @@ -79,10 +90,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 @@ -115,7 +126,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; \ @@ -146,13 +157,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 @@ -165,5 +176,35 @@ define MD5 endef define PAK - /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER) + # Bringing the files to their right place. + @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 + 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 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/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \ + < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG) endef