Skip to contentSkip to conversation

kbuild fixes

GIT PULL Sam Ravnborg 2 participants 6 messages Apr 26, 2008 Kbuild

lore
Share & tools
lore

Sam Ravnborg

author
#0 lore raw

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(-)
scripts/Makefile.modpost +1 -1
index 24b3c8f..a098a04 100644
@@ -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)) \
scripts/mod/modpost.c +4 -4
index f8b42ab..757294b 100644
@@ -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;
#1 lore raw
Quoted 9 lines · Sam Ravnborg

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.

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?
(my allmod build is not yet finished)

Quoted 1 line

Sam

cu
Adrian

Signature · 4 lines
       "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
author
#2 lore raw
Quoted 8 lines · Adrian Bunk
Quoted 7 lines · Sam Ravnborg

Hi Linus.

Please apply the following two fixes by pulling from:

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

Quoted 7 lines
Quoted 2 lines

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

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?
(my allmod build is not yet finished)

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

author
#3 lore raw
Quoted 20 lines · Sam Ravnborg
Quoted 8 lines · Adrian Bunk
Quoted 7 lines · Sam Ravnborg

Hi Linus.

Please apply the following two fixes by pulling from:

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

Quoted 7 lines
Quoted 2 lines

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

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?
(my allmod build is not yet finished)

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

Quoted 6 lines

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.

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

#4 lore raw
Quoted 25 lines · Sam Ravnborg
Quoted 24 lines · Sam Ravnborg
Quoted 8 lines · Adrian Bunk
Quoted 7 lines · Sam Ravnborg

Hi Linus.

Please apply the following two fixes by pulling from:

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

Quoted 7 lines
Quoted 2 lines

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

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?
(my allmod build is not yet finished)

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.

Quoted 5 lines
Quoted 2 lines

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

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.
...

I had it in my test builds that cover x86 all modular and all defconfigs (except ppc), so I doubt there's much breakage of kind 1) left.

Quoted 1 line

Sam

cu
Adrian

Signature · 4 lines
       "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
#5 lore raw
In reply to Sam Ravnborg
Quoted 12 lines · Sam Ravnborg
Quoted 11 lines · Adrian Bunk
Quoted 9 lines · Sam Ravnborg

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.

Quoted 6 lines
Quoted 4 lines

Which one is this?

http://lkml.org/lkml/2008/3/31/50 ?
(my allmod build is not yet finished)

The changelog was actually bad for this one.

It was not a build error when I sent it one month ago, and that was the changelog in all such patches I sent.

Quoted 5 lines

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.

OK, I never tried 2).

As long as this problem exists even a warning shouldn't be issued.

Quoted 2 lines

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

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 error since new bugs always get added. ;-)

Quoted 1 line

Sam

cu
Adrian

Signature · 4 lines
       "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