From 2279c47641e0238d952ef1c29a53824d512e9f78 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Tue, 14 Oct 2008 08:09:00 +0000 Subject: [PATCH] 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 --- rules/linux/kernelcfg2mk | 4 ---- snippets/linux | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/linux/kernelcfg2mk b/rules/linux/kernelcfg2mk index 435b387..c18a497 100755 --- 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_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) diff --git a/snippets/linux b/snippets/linux index a725373..97cf6bf 100644 --- 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 +ifneq ($(LINUX_BUILDHOST),) # this is not correct point, it should look for 2.6.17 kernel MODPOST_OPTS += -I $(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 +ifneq ($(LINUX_BUILDHOST),) ifneq ($(LINUX_BUILDHOST),$(LINUX_ARCH)) MODPOST_OPTS += -c endif +endif define COMPILE_c_o_kern_template -- 2.39.2