image.mk: force rebuild of kernel dependent parts - fixes auto-rebuild on DTS changes

[openwrt/openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 432efd6cebf71a26733eb6fc8fd83d0062734c1e..9abfd542e8faa7d99ec371e686bffaa91ab1cff0 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -32,6 +32,7 @@ endef
 
 define Kernel/CompileImage
        $(call Kernel/CompileImage/Default)
+       $(call Kernel/CompileImage/Initramfs)
 endef
 
 define Kernel/Clean
@@ -61,31 +62,41 @@ define BuildKernel
   $(if $(QUILT),$(Build/Quilt))
   $(if $(LINUX_SITE),$(call Download,kernel))
 
-  $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
+  .NOTPARALLEL:
+
+  $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
        -rm -rf $(KERNEL_BUILD_DIR)
        -mkdir -p $(KERNEL_BUILD_DIR)
        $(Kernel/Prepare)
        touch $$@
 
-  $(KERNEL_BUILD_DIR)/symtab.txt: FORCE
+  $(KERNEL_BUILD_DIR)/symtab.h: FORCE
+       rm -f $(KERNEL_BUILD_DIR)/symtab.h
+       touch $(KERNEL_BUILD_DIR)/symtab.h
+       +$(MAKE) $(KERNEL_MAKEOPTS) vmlinux
        find $(LINUX_DIR) $(STAGING_DIR_ROOT)/lib/modules -name \*.ko | \
                xargs $(TARGET_CROSS)nm | \
                awk '$$$$1 == "U" { print $$$$2 } ' | \
-               sort -u > $$@
-
-  $(KERNEL_BUILD_DIR)/symtab.h: $(KERNEL_BUILD_DIR)/symtab.txt
+               sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt
+       $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' [rR] __ksymtab' | sed -e 's,........ [rR] __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
+       grep -Ff $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
+       grep -Fvf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt
        ( \
                echo '#define SYMTAB_KEEP \'; \
-               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
-                       awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \
+               cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
+                       awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \
                echo; \
                echo '#define SYMTAB_KEEP_GPL \'; \
-               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
-                       awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \
+               cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
+                       awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \
+               echo; \
+               echo '#define SYMTAB_DISCARD \'; \
+               cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
+                       awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \
                echo; \
-               echo '#define SYMTAB_KEEP_STR \'; \
-               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
-                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
+               echo '#define SYMTAB_DISCARD_GPL \'; \
+               cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
+                       awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
                echo; \
        ) > $$@
 
@@ -108,7 +119,7 @@ define BuildKernel
   define BuildKernel
   endef
 
-  download: $(DL_DIR)/$(LINUX_SOURCE)
+  download: $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
   prepare: $(STAMP_CONFIGURED)
   compile: $(LINUX_DIR)/.modules
        $(MAKE) -C image compile TARGET_BUILD=