Starte SSH-Server beim Boot.

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

diff --git a/lfs/Config b/lfs/Config
index af89c7ba8e5cb38684034866dcfacc621f5e2765..3ec7cb820ce25c7228c26f146595c7ca4a4adec5 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -22,7 +22,8 @@ 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_IPFIRE  = http://source.ipfire.eu/othersrc
+URL_TOOLCHAIN = http://source.ipfire.eu/toolchain
 URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.
@@ -51,7 +52,7 @@ DIR_CONF    = $(LFS_BASEDIR)/config
 DIR_INFO    = $(LFS_BASEDIR)/log
 DIR_TMP     = /var/tmp
 
-KGCC = ccache /usr/bin/gcc
+KGCC = gcc
 
 ###############################################################################
 # Common Macro Definitions
@@ -73,6 +74,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
@@ -84,27 +96,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
@@ -130,22 +161,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
-       @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 zvcf /install/packages/package/files.tgz * -C /tmp
-       rm -rf /tmp/*
-       cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES && tar cfz ../$(PROG)-$(VER)-$(PAK_VER).tar.gz files.tgz install.sh uninstall.sh ROOTFILES
-       cd /install/packages && md5sum $(THISAPP)-$(PAK_VER).tar.gz > $(PROG)-$(VER)-$(PAK_VER).tar.gz.md5
-       @rm -rf /install/packages/package
+       /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER)
 endef