X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-build.mk;h=2bf639218a46cf036b32013e7d97ff9eca5cc335;hb=6d1ec556b21d49cb85cfad0d44ccac5ee17926b9;hp=0b7b54fdd8797ff60fd171f8dc96630a26c4ea0d;hpb=f56be9ab839b7badce0b7d4baa9159f7c1b04a6d;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 0b7b54fdd8..2bf639218a 100644
--- 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
@@ -75,21 +76,17 @@ 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 -F ' r __ksymtab' | sed -e 's,........ r __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 | \
@@ -99,10 +96,6 @@ define BuildKernel
 		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 ") \\" }'; \
-		echo; \
 	) > $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
@@ -124,7 +117,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=