From f5d71623bdb0a997570b8047b113cfab0fe61961 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Fri, 24 Jun 2011 15:49:53 +0200 Subject: [PATCH] Linux kernel modules build support adapted for KBUILD 2.6.36+ changes. Signed-off-by: Pavel Pisa --- rules/linux/kernelcfg2mk | 7 +++++++ snippets/linux.omk | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rules/linux/kernelcfg2mk b/rules/linux/kernelcfg2mk index 3fd50d2..9d9b84c 100755 --- a/rules/linux/kernelcfg2mk +++ b/rules/linux/kernelcfg2mk @@ -163,7 +163,14 @@ else @echo LINUX_AFLAGS="\$(AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags @echo LINUX_CFLAGS="\$(CFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags endif +ifdef KBUILD_CFLAGS_MODULE + @echo LINUX_CFLAGS_MODULE="\$(KBUILD_CFLAGS_MODULE)" >>\$(obj)/flags + @echo LINUX_AFLAGS_MODULE="\$(KBUILD_AFLAGS_MODULE)" >>\$(obj)/flags + @echo LINUX_LDFLAGS_MODULE="\$(KBUILD_LDFLAGS_MODULE)" >>\$(obj)/flags +else @echo LINUX_CFLAGS_MODULE="\$(CFLAGS_MODULE)" >>\$(obj)/flags + @echo LINUX_AFLAGS_MODULE="\$(CFLAGS_MODULE)" >>\$(obj)/flags +endif @echo LINUX_CC="\$(CC)" >>\$(obj)/flags @echo LINUX_LD="\$(LD) \$(LDFLAGS) \$(LDFLAGS_MODULE)" | sed 's#\(\\)#"\$(LINUXDIR)/\1"#g' >>\$(obj)/flags @echo LINUX_AS="\$(AS)" >>\$(obj)/flags diff --git a/snippets/linux.omk b/snippets/linux.omk index 7868aa3..79cc2b9 100644 --- a/snippets/linux.omk +++ b/snippets/linux.omk @@ -461,9 +461,9 @@ KERN_CC = echo KERN_CC not defined - compilation skipped endif c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc cc_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc +S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_AFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT) -KERN_LDFLAGS = $(LINUX_LDFLAGS) +KERN_LDFLAGS = $(LINUX_LDFLAGS) $(LINUX_LDFLAGS_MODULE) ifdef LINUX_ARCH KERN_ARCH = $(LINUX_ARCH) else -- 2.39.2