[GIT PULL] kbuild fixes

Previous thread: [RFC git pull] "big box" x86 changes by Ingo Molnar on Saturday, April 26, 2008 - 11:55 am. (52 messages)

Next thread: [git pull] x86 fix by Ingo Molnar on Saturday, April 26, 2008 - 12:47 pm. (2 messages)
From: Sam Ravnborg
Date: Saturday, April 26, 2008 - 12:12 pm

Hi Linus.

Please apply the following two fixes by pulling from:

   master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git


The MODULE_LICENSE fix is neded to get an allmodconfig
build fixed.

	Sam


Adrian Bunk (1):
      kbuild: scripts/Makefile.modpost typo fix

Sam Ravnborg (1):
      kbuild: soften MODULE_LICENSE check

 scripts/Makefile.modpost |    2 +-
 scripts/mod/modpost.c    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 24b3c8f..a098a04 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -76,7 +76,7 @@ modpost = scripts/mod/modpost                    \
  $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)       \
  $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)   \
  $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \
- $(if $(iKBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(EXTRA_SYMBOLS))) \
+ $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(CONFIG_MARKERS),-K $(kernelmarkersfile)) \
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f8b42ab..757294b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1552,10 +1552,10 @@ static void read_symbols(char *modname)
 	}
 
 	license = get_modinfo(info.modinfo, info.modinfo_len, "license");
-	if (!license && !is_vmlinux(modname))
-		fatal("modpost: missing MODULE_LICENSE() in %s\n"
-		      "see include/linux/module.h for "
-		      "more information\n", modname);
+	if (info.modinfo && !license && !is_vmlinux(modname))
+		warn("modpost: missing MODULE_LICENSE() in %s\n"
+		     "see include/linux/module.h for "
+		     "more information\n", modname);
 	while (license) {
 		if (license_is_gpl_compatible(license))
 			mod->gpl_compatible = 1;
--

From: Adrian Bunk
Date: Saturday, April 26, 2008 - 12:20 pm

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

--

From: Sam Ravnborg
Date: Saturday, April 26, 2008 - 12:37 pm

The changelog was actually bad for this one.
I saw two classes of problems:

1) I got report about broken builds - fbdev was the culprint.
2) a "make CONFIG_DEBUG_SECTION_MISMATCH=y" build broke
   immediately.

I made it non-fatal because we had at least one module that
was not yet fixed.

	Sam
--

From: Sam Ravnborg
Date: Saturday, April 26, 2008 - 12:49 pm

And by the way - had this been in -mm/-next as it ought to
be we wuld know the eventual breakage it would have caused.
But I have been a lousy maintainer the last months so that
did not happen as it should and the MODULE_LICENSE
thing went straight to -linus.

	Sam
--

From: Adrian Bunk
Date: Saturday, April 26, 2008 - 12:55 pm

I had it in my test builds that cover x86 all modular and all defconfigs 

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

--

From: Adrian Bunk
Date: Saturday, April 26, 2008 - 1:05 pm

It was not a build error when I sent it one month ago, and that was the 

OK, I never tried 2).


I had this patch in my test compiles for some time.

Considering that I had a new such bug to fix during this merge window
"at least one unfixed module" is a bad prerequisite for making it an 

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

--

[