image.mk: add Build step combined-image
[openwrt/svn-archive/archive.git] / include / kernel-build.mk
index 2ae80e5..9abfd54 100644 (file)
@@ -32,6 +32,7 @@ endef
 
 define Kernel/CompileImage
        $(call Kernel/CompileImage/Default)
+       $(call Kernel/CompileImage/Initramfs)
 endef
 
 define Kernel/Clean
@@ -61,6 +62,8 @@ define BuildKernel
   $(if $(QUILT),$(Build/Quilt))
   $(if $(LINUX_SITE),$(call Download,kernel))
 
+  .NOTPARALLEL:
+
   $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
        -rm -rf $(KERNEL_BUILD_DIR)
        -mkdir -p $(KERNEL_BUILD_DIR)
@@ -75,33 +78,25 @@ define BuildKernel
                xargs $(TARGET_CROSS)nm | \
                awk '$$$$1 == "U" { print $$$$2 } ' | \
                sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt
-       $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' r __ksymtab' | sed -e 's,........ r __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
-       grep -f $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
-       grep -vf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.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)/sym_include.txt | \
-                       awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \
+                       awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \
                echo; \
                echo '#define SYMTAB_KEEP_GPL \'; \
                cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-                       awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \
-               echo; \
-               echo '#define SYMTAB_KEEP_STR \'; \
-               cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
+                       awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \
                echo; \
                echo '#define SYMTAB_DISCARD \'; \
                cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-                       awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \
+                       awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \
                echo; \
                echo '#define SYMTAB_DISCARD_GPL \'; \
                cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-                       awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \
-               echo; \
-               echo '#define SYMTAB_DISCARD_STR \'; \
-               cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
+                       awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
                echo; \
        ) > $$@
 
@@ -124,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=