Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/lfs/Config b/lfs/Config
index bc9375ac638c181a3d5b72086a768af0975ae7d7..01b9cf1c92bb7661fa2ad17135936230a00e7709 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -75,7 +75,7 @@ KGCC = gcc
 define FIND_FILES
        cd $(ROOT)/ && find -mount \
        -not -path './tools*' -not -path './tmp*' -not -path './usr/src*' \
-       -not -path './dev*' -not -path './proc*' -not -path './install*'
+       -not -path './dev*' -not -path './proc*' -not -path './install*' | sort
 endef
 
 # This is common starting logic for builds.
@@ -88,7 +88,10 @@ define PREBUILD
        # 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 [ "$(XEN)" = "" ]; then \
+               if [ "$(PAE)" = "1" ]; then \
+                       cd $(DIR_SRC)/linux-$(KVER) && \
+                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-pae+' Makefile; \
+               elif [ "$(XEN)" = "" ]; then \
                        cd $(DIR_SRC)/linux-$(KVER) && \
                                sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
                else \
@@ -109,7 +112,7 @@ ifeq "$(ROOT)" ""
 define POSTBUILD
        @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)_diff
+       @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
        @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
        @rm -f $(DIR_SRC)/lsalrnew
        sed -i -e 's+.\/++' $(TARGET)_diff
@@ -122,7 +125,8 @@ define POSTBUILD
        # $(TARGET)_rootfile : ROOTFILE with KVER replacement
        # $(TARGET) : log result with {commented|include|added} files
        if [ -s "$(TARGET)_diff" ]; then \
-               if [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
+               if [ "$(PAE)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-pae; \
+               elif [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
                else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
                fi; \
                echo $(LFS_SCRIPT); \