[kernel] Add missing config option

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 089753e..7c5d1fb 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -11,6 +11,7 @@ ifneq ($(DUMP),1)
   all: compile
 endif
 
   all: compile
 endif
 

+export QUILT=1

 STAMP_PREPARED:=$(LINUX_DIR)/.prepared
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
 include $(INCLUDE_DIR)/download.mk
 STAMP_PREPARED:=$(LINUX_DIR)/.prepared
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
 include $(INCLUDE_DIR)/download.mk


@@ -53,6 +54,28 @@ define BuildKernel
        $(Kernel/Prepare)
        touch $$@
 
        $(Kernel/Prepare)
        touch $$@
 

+  $(KERNEL_BUILD_DIR)/symtab.txt: FORCE
+       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
+       ( \
+               echo '#define SYMTAB_KEEP \'; \
+               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
+                       awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \
+               echo; \
+               echo '#define SYMTAB_KEEP_GPL \'; \
+               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
+                       awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \
+               echo; \
+               echo '#define SYMTAB_KEEP_STR \'; \
+               cat $(KERNEL_BUILD_DIR)/symtab.txt | \
+                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
+               echo; \
+       ) > $$@
+

   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
        $(Kernel/Configure)
        touch $$@
   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
        $(Kernel/Configure)
        touch $$@


@@ -61,7 +84,7 @@ define BuildKernel
        $(Kernel/CompileModules)
        touch $$@
 
        $(Kernel/CompileModules)
        touch $$@
 

-  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) $(if $(CONFIG_STRIP_KERNEL_EXPORTS),$(KERNEL_BUILD_DIR)/symtab.h) FORCE

        $(Kernel/CompileImage)
        touch $$@
        
        $(Kernel/CompileImage)
        touch $$@
        


@@ -76,12 +99,13 @@ define BuildKernel
   compile: $(LINUX_DIR)/.modules
        $(MAKE) -C image compile TARGET_BUILD=
 
   compile: $(LINUX_DIR)/.modules
        $(MAKE) -C image compile TARGET_BUILD=
 

-  oldconfig menuconfig: $(STAMP_PREPARED) FORCE
+  oldconfig menuconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE

        [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"
        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
        touch $(LINUX_CONFIG)
        $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
        [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"
        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
        touch $(LINUX_CONFIG)
        $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@

-       $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
+       $(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \
+               $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))

        $(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image
        $(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image