Zwischencommit fuer LFS.

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index 7615fd7c2b7b56db5d435f9f030713bf9a010290..9a81690c7918eb983532debda427d908067f7e7c 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -21,7 +21,9 @@ 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_SFNET   = http://kent.dl.sourceforge.net/sourceforge
+URL_IPFIRE  = http://mirror.ipfire.org/source
+URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.
 #
@@ -45,11 +47,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     = /tmp
+DIR_TMP     = /var/tmp
 
 KGCC = ccache /usr/bin/gcc
-KVER = 2.4.31
 
 ###############################################################################
 # Common Macro Definitions
@@ -84,25 +86,27 @@ ifeq "$(ROOT)" ""
 define POSTBUILD
        @echo "Install done; saving file list to $(DIR_INFO)/$(THISAPP) ..."
        @$(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 \
+       # - on a partial rebuild without a new file inside TARGET_diff, just touch TARGET
+       if [ -s "$(TARGET)_diff" ]; 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); \
+               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
@@ -128,4 +132,9 @@ 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
+       /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER)
 endef