Removed Linux variables which could not be obtained from kernelcfg2mk probe.

These variables are only local for Makefile.modpost.
The modpost option -I has been introduced for 2.6.17 kernel.
The test used enables it only for 2.6.25+ kernels.

darcs-hash:20081014080915-ff715-781b3d63c6747bcd5fa171d390a8923e6bca533e.gz

diff --git a/rules/linux/kernelcfg2mk b/rules/linux/kernelcfg2mk
index 435b38779315afafb4c17dd70045cc131f0c7795..c18a4973ab8da0ba578d8121ffdd2b64da997e77 100755 (executable)
--- a/rules/linux/kernelcfg2mk
+++ b/rules/linux/kernelcfg2mk
@@ -174,10 +174,6 @@ endif
        @echo LINUX_KBUILD_EXTRA_SYMBOLS=\$(KBUILD_EXTRA_SYMBOLS) >>\$(obj)/flags
        @echo LINUX_KBUILD_MODPOST_WARN=\$(KBUILD_MODPOST_WARN) >>\$(obj)/flags
        @echo LINUX_CROSS_BUILD=\$(cross_build) >>\$(obj)/flags
        @echo LINUX_KBUILD_EXTRA_SYMBOLS=\$(KBUILD_EXTRA_SYMBOLS) >>\$(obj)/flags
        @echo LINUX_KBUILD_MODPOST_WARN=\$(KBUILD_MODPOST_WARN) >>\$(obj)/flags
        @echo LINUX_CROSS_BUILD=\$(cross_build) >>\$(obj)/flags

-       @echo LINUX_KERNELSYMFILE=\$(kernelsymfile) >>\$(obj)/flags
-       @echo LINUX_MODULESYMFILE=\$(modulesymfile) >>\$(obj)/flags
-       @echo LINUX_KERNELMARKERSFILE=\$(kernelmarkersfile) >>\$(obj)/flags
-       @echo LINUX_MARKERSFILE=\$(markersfile) >>\$(obj)/flags

 EOF
 
        # modkern_cflags := $(CFLAGS_KERNEL) / $(CFLAGS_MODULE)
 EOF
 
        # modkern_cflags := $(CFLAGS_KERNEL) / $(CFLAGS_MODULE)

diff --git a/snippets/linux b/snippets/linux
index a72537383e83ac3242e0ab4a5e87fe124532b983..97cf6bf026ba051a38a63dd1b245f053e11c72c2 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -471,7 +471,9 @@ endif
 ifeq ($(LINUX_CONFIG_MODVERSIONS),y)
 MODPOST_OPTS += -m
 MODPOST_OPTS += -i $(LINUX_DIR)/Module.symvers
 ifeq ($(LINUX_CONFIG_MODVERSIONS),y)
 MODPOST_OPTS += -m
 MODPOST_OPTS += -i $(LINUX_DIR)/Module.symvers

+ifneq ($(LINUX_BUILDHOST),) # this is not correct point, it should look for 2.6.17 kernel

 MODPOST_OPTS += -I $(KERN_LIB_DIR)/Module.symvers
 MODPOST_OPTS += -I $(KERN_LIB_DIR)/Module.symvers

+endif

 MODPOST_OPTS += -o $(KERN_LIB_DIR)/Module.symvers
 endif
 
 MODPOST_OPTS += -o $(KERN_LIB_DIR)/Module.symvers
 endif
 


@@ -488,9 +490,11 @@ ifeq ($(LINUX_KBUILD_MODPOST_WARN),y)
 MODPOST_OPTS += -w
 endif
 
 MODPOST_OPTS += -w
 endif
 

+ifneq ($(LINUX_BUILDHOST),)

 ifneq ($(LINUX_BUILDHOST),$(LINUX_ARCH))
 MODPOST_OPTS += -c
 endif
 ifneq ($(LINUX_BUILDHOST),$(LINUX_ARCH))
 MODPOST_OPTS += -c
 endif

+endif

 
 define COMPILE_c_o_kern_template
 
 
 define COMPILE_c_o_kern_template