[GIT PULL] fix kbuild regression



Hi Linus.

Please pull from:

ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git


Sam


To get the following fix:

Sam Ravnborg (1):
kbuild: fix $(src) assignmnet with external modules

When we introduced support for KBUILD_EXTRA_SYMBOLS
we started to include the externam module's kbuild
file when doing the final modpost step.

As external modules often do:
ccflags-y := -I$(src)

We had problems because $(src) was unassinged and
gcc then used the next parameter for -I resulting in
strange build failures.

Fix is to assign $(src) and $(obj) when building
external modules.

This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10798

Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Tvrtko <tvrtko.ursulin@xxxxxxxxxx>
Cc: Andrea Arcangeli <andrea@xxxxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>

scripts/Makefile.modpost | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index a098a04..17092d6 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -43,7 +43,13 @@ _modpost: __modpost
include include/config/auto.conf
include scripts/Kbuild.include

+# When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info
ifneq ($(KBUILD_EXTMOD),)
+
+# set src + obj - they may be used when building the .mod.c file
+obj := $(KBUILD_EXTMOD)
+src := $(obj)
+
# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
$(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



Relevant Pages

  • [git patches] kbuild fixes for 2.6.17-rc1
    ... Here follows kbuild fixes for 2.6.17-rc1 + a number of kconfig fixes. ... fix mips build after introducing -fasm-offsets gcc flag ... modules_install for external modules must not remove existing modules ...
    (Linux-Kernel)
  • kbuild: Major update of modules.txt
    ... kbuild: Major update of Documentation/kbuild/modules.txt ... Included some of the information given to people developing external modules. ... -This will install the modules in the directory /frodo/lib/modules. ... -Often modules are developed outside the official kernel. ...
    (Linux-Kernel)
  • [PATCH 8/28] kbuild: linguistic fixes for Documentation/kbuild/modules.txt
    ... these files?), Sam (kbuild maintainer), Adrian. ... how to install modules in a non-standard location ... within the kernel source tree and outside the kernel source tree. ... -The latter is usually referred to as external modules and is used ...
    (Linux-Kernel)
  • [GIT PATCH] kbuild fixes for 2.6.18
    ... do not try to build content of initramfs ... kbuild: external modules shall not check config consistency ...
    (Linux-Kernel)
  • Re: [PATCH 5/5] kbuild: external module build doc
    ... > +kbuild offers functionality to build external modules, ... send the line "unsubscribe linux-kernel" in ...
    (Linux-Kernel)