[GIT PULL] kbuild fixes

[GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

A few kbuild related fixes.

- revert of "save ARCH & CROSS_COMPILE ..." commit
  It has caused issues for several people, and now it is better
  to revert it rather than trying to fix it.
  I would expext any fix to surface addition issues.

- Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users

- Warn when people try to build userspace using non-exported
  headers.
  This is not a strict fix but is a nice way to catch when
  people uses the kernel headers in the wrong way.
  This patch may prevent some confusion.

- binrpm-pkg now works with KBUILD_OUTPUT set

The patches has been rebased very recently as I had to kill
a few patches that was not -fixes relevant for -rc3.

	Sam

The following changes since commit f144c78e525542c94e0dcb171b41cc5ef7b341b3:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

are available in the git repository at:

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

Alek Du (1):
      kbuild: Fix size_append issue for bzip2/lzma kernel

Amerigo Wang (1):
      kbuild,scripts: use non-builtin echo for '-e'

Arnd Bergmann (1):
      warn about use of uninstalled kernel headers

Felipe Contreras (2):
      kbuild: fix warning when domainname is not available
      kbuild: mkcompile_h: trivial cleanups

Frans Pop (1):
      kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set

Sam Ravnborg (1):
      kbuild: revert "save ARCH & CROSS_COMPILE ..."

 Makefile                       |   46 +--------------------------------------
 include/linux/kernel.h         |    6 +++++
 scripts/Kbuild.include         |    2 +-
 scripts/Makefile.lib           |    2 +-
 scripts/checkkconfigsymbols.sh |    4 +-
 scripts/headers_install.pl     |    2 +-
 scripts/mkcompile_h            |   12 +++++++--
 scripts/package/Makefile       |   11 ++++++++-
 scripts/package/mkspec         |    2 +-
 9 files changed, 33 insertions(+), 54 deletions(-)

Re: [GIT PULL] kbuild fixes

[Michael Tokarev]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

Sam Ravnborg wrote:
> Hi Linus.
> 
> A few kbuild related fixes.
[]
> - Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users

As has been discussed previously (and Sam has been CC'ed), the fix
is still incorrect.  It replaces "echo -ne" with "/bin/echo -ne",
but neither of the two are guaranteed to support the necessary
arguments and necessary (hexadecimal) escape sequences.  What should
be used here is printf(1).  The trivial patch below (on top of these
kbuild changes) fixes this issue.

Thanks.

/mjt

Signed-Off-By: Michael Tokarev <mjt@tls.msk.ru>

[-- Attachment #2: echo-vs-printf.diff --]
[-- Type: text/x-patch, Size: 529 bytes --]

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index ffdafb2..d9f0cb8 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -208,7 +208,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
 
 # Bzip2 and LZMA do not include size in file... so we have to fake that;
 # append the size as a 32-bit littleendian number as gzip does.
-size_append = /bin/echo -ne $(shell					\
+size_append = printf $(shell						\
 dec_size=0;								\
 for F in $1; do								\
 	fsize=$$(stat -c "%s" $$F);					\

Re: [GIT PULL] kbuild fixes

[Américo Wang]

On Mon, Oct 12, 2009 at 4:41 PM, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Sam Ravnborg wrote:
>>
>> Hi Linus.
>>
>> A few kbuild related fixes.
>
> []
>>
>> - Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users
>
> As has been discussed previously (and Sam has been CC'ed), the fix
> is still incorrect.  It replaces "echo -ne" with "/bin/echo -ne",
> but neither of the two are guaranteed to support the necessary
> arguments and necessary (hexadecimal) escape sequences.  What should
> be used here is printf(1).  The trivial patch below (on top of these
> kbuild changes) fixes this issue.
>
> Thanks.
>
> /mjt
>
> Signed-Off-By: Michael Tokarev <mjt@tls.msk.ru>
>

Sorry, I just saw this email.

Hmm, printf(1) should be more portable than echo(1), I checked your patch,
how about using 'printf "%b" ' instead?

Thanks!

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

On Mon, Oct 12, 2009 at 12:41:42PM +0400, Michael Tokarev wrote:
> Sam Ravnborg wrote:
>> Hi Linus.
>>
>> A few kbuild related fixes.
> []
>> - Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users
>
> As has been discussed previously (and Sam has been CC'ed), the fix
> is still incorrect.

In the thread hpa asked for a patch at least twice.
Only after I submitted -fixes to Linus it shows up.

Bad timing.

And please - do not even think of asking me to do it.
You guys are the one that see the issue, who know how to fix it,
and knows how to check that the fix really works.

In other words - provide a patch next time you are asked to do so.

I'm off for much needed vacation rest of the week and
may rememeber to handle the patch when I get back...

	Sam

Re: [GIT PULL] kbuild fixes

[Michael Tokarev]

Sam Ravnborg wrote:
> On Mon, Oct 12, 2009 at 12:41:42PM +0400, Michael Tokarev wrote:
>> Sam Ravnborg wrote:
>>> Hi Linus.
>>>
>>> A few kbuild related fixes.
>> []
>>> - Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users
>> As has been discussed previously (and Sam has been CC'ed), the fix
>> is still incorrect.
> 
> In the thread hpa asked for a patch at least twice.
> Only after I submitted -fixes to Linus it shows up.
> 
> Bad timing.
> 
> And please - do not even think of asking me to do it.

How many patches should one send? How many trees one should
compare against and send different patch for, in case such
an obvious trivial cases?  If I'll provide this against
mainline, it wont apply to Sam's tree.  If against Sam's
tree, it wont apply to mainline.  And for such trivial
cases, it's just amusing to expect full patch.

It's not bad timing.  I needed to know which damn tree
I should diff against.  In Sam's pull request I found
the - hopefully - correct tree.

Please don't even think I will be submitting something like
this again.  I spent half a week debugging a mysterious issue,
and I provided at least information in hope it will be useful
to someone with the same issue.  And it turns out that by doing
so, *I* owe something to everyone else.  It's not how things
works, or SHOULD work.

Thanks.

/mjt

> You guys are the one that see the issue, who know how to fix it,
> and knows how to check that the fix really works.
> 
> In other words - provide a patch next time you are asked to do so.
> 
> I'm off for much needed vacation rest of the week and
> may rememeber to handle the patch when I get back...
> 
> 	Sam

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

On Tue, Oct 13, 2009 at 11:19:52PM +0400, Michael Tokarev wrote:
> Sam Ravnborg wrote:
>> On Mon, Oct 12, 2009 at 12:41:42PM +0400, Michael Tokarev wrote:
>>> Sam Ravnborg wrote:
>>>> Hi Linus.
>>>>
>>>> A few kbuild related fixes.
>>> []
>>>> - Fix use of echo -ne. Is caused issues for ubuntu (IIRC) users
>>> As has been discussed previously (and Sam has been CC'ed), the fix
>>> is still incorrect.
>>
>> In the thread hpa asked for a patch at least twice.
>> Only after I submitted -fixes to Linus it shows up.
>>
>> Bad timing.
>>
>> And please - do not even think of asking me to do it.
>
> How many patches should one send? How many trees one should
> compare against and send different patch for, in case such
> an obvious trivial cases?  If I'll provide this against
> mainline, it wont apply to Sam's tree.
mainline - a replacement patch would have been
what I had expected to see.

I took you patch and gave it a hopefully proper
subject and applied it to kbuild-fixes.git.

	Sam

Re: [GIT PULL] kbuild fixes

[Michael Tokarev]

Sam Ravnborg wrote:
> On Tue, Oct 13, 2009 at 11:19:52PM +0400, Michael Tokarev wrote:
>> Sam Ravnborg wrote:
[]
>>> And please - do not even think of asking me to do it.

>> How many patches should one send? How many trees one should
>> compare against and send different patch for, in case such
>> an obvious trivial cases?  If I'll provide this against
>> mainline, it wont apply to Sam's tree.

> mainline - a replacement patch would have been
> what I had expected to see.

That's what I didn't think of.  Due to the "trivialness" of
the whole thing (it's easier to go edit the target file
directly than to apply patches), and because.. well.. it
didn't occur to me ;)

> I took you patch and gave it a hopefully proper
> subject and applied it to kbuild-fixes.git.

Thank you Sam.

/mjt

Re: [GIT PULL] kbuild fixes

[Russell King]

On Wed, Aug 06, 2008 at 10:27:38PM +0200, Sam Ravnborg wrote:
> Please pull following kbuild related fixes.
> 
> o Fix "make O=..." builds for arm
> o update to for newer cscope
> o patch-kernel fix (but I doubt it has many uses)
> o small Kconfig clean-up

Note that I've also merged your tree into mine, so I can test my
further asm-arm renames with something that works.  So far, it's
looking good, thanks.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

[GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

Please pull following kbuild related fixes.

o Fix "make O=..." builds for arm
o update to for newer cscope
o patch-kernel fix (but I doubt it has many uses)
o small Kconfig clean-up

	Sam

The following changes since commit 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55:
  Linus Torvalds (1):
        Linux 2.6.27-rc2

are available in the git repository at:

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

Denis ChengRq (1):
      kbuild: a better way to generate cscope database change

Erkki Lintunen (1):
      bugfix for scripts/patch-kernel in 2.6 sublevel stepping

Robert P. J. Day (1):
      Kconfig: Extend "menuconfig" for modules to simplify Kconfig file

Sam Ravnborg (1):
      kbuild: fix O=.. build with arm

 Makefile             |    8 ++++----
 init/Kconfig         |    9 ++++-----
 scripts/patch-kernel |    3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ea413fa..f3e2065 100644
--- a/Makefile
+++ b/Makefile
@@ -929,10 +929,10 @@ ifneq ($(KBUILD_SRC),)
 		echo "  in the '$(srctree)' directory.";\
 		/bin/false; \
 	fi;
-	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then  \
+	$(Q)if [ ! -d include2 ]; then                                  \
+	    mkdir -p include2;                                          \
 	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
-	    fi
+	fi
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -1492,7 +1492,7 @@ quiet_cmd_cscope-file = FILELST cscope.files
       cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
 
 quiet_cmd_cscope = MAKE    cscope.out
-      cmd_cscope = cscope -b
+      cmd_cscope = cscope -b -f cscope.out
 
 cscope: FORCE
 	$(call cmd,cscope-file)
diff --git a/init/Kconfig b/init/Kconfig
index 7e6dae1..b678803 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,10 @@ menuconfig MODULES
 
 	  If unsure, say Y.
 
+if MODULES
+
 config MODULE_FORCE_LOAD
 	bool "Forced module loading"
-	depends on MODULES
 	default n
 	help
 	  Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD
 
 config MODULE_UNLOAD
 	bool "Module unloading"
-	depends on MODULES
 	help
 	  Without this option you will not be able to unload any
 	  modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD
 
 config MODVERSIONS
 	bool "Module versioning support"
-	depends on MODULES
 	help
 	  Usually, you have to use modules compiled with your kernel.
 	  Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS
 
 config MODULE_SRCVERSION_ALL
 	bool "Source checksum for all modules"
-	depends on MODULES
 	help
 	  Modules which contain a MODULE_VERSION get an extra "srcversion"
 	  field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL
 
 config KMOD
 	def_bool y
-	depends on MODULES
 	help
 	  This is being removed soon.  These days, CONFIG_MODULES
 	  implies CONFIG_KMOD, so use that instead.
 
+endif # MODULES
+
 config STOP_MACHINE
 	bool
 	default y
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index ece46ef..46a59ca 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -213,6 +213,7 @@ fi
 if [ $stopvers != "default" ]; then
 	STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`
 	STOPEXTRA=`echo $stopvers | cut -d. -f4`
+	STOPFULLVERSION=${stopvers%%.$STOPEXTRA}
 	#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"
 else
 	STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while :				# incrementing SUBLEVEL (s in v.p.s)
 do
     CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
     EXTRAVER=
-    if [ $stopvers = $CURRENTFULLVERSION ]; then
+    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
         echo "Stopping at $CURRENTFULLVERSION base as requested."
         break
     fi

[GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

Please pull the following two kconfig related fixes.

	Sam


The following changes since commit 48a61569bb5396415c5dad0e81e1cfeb87c0aca3:
  Adrian Bunk (1):
        kbuild: scripts/ver_linux: don't set PATH

are available in the git repository at:

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

Sam Ravnborg (2):
      kconfig: always write out .config
      kconfig: drop the ""trying to assign nonexistent symbol" warning

 scripts/kconfig/conf.c     |    2 +-
 scripts/kconfig/confdata.c |    8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9fba838..36b5eed 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -596,7 +596,7 @@ int main(int ac, char **av)
 		break;
 	}
 
-	if (conf_get_changed() && conf_write(NULL)) {
+	if (conf_write(NULL)) {
 		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
 		exit(1);
 	}
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 0759761..df6a188 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -222,10 +222,8 @@ load:
 				continue;
 			if (def == S_DEF_USER) {
 				sym = sym_find(line + 9);
-				if (!sym) {
-					conf_warning("trying to assign nonexistent symbol %s", line + 9);
+				if (!sym)
 					break;
-				}
 			} else {
 				sym = sym_lookup(line + 9, 0);
 				if (sym->type == S_UNKNOWN)
@@ -261,10 +259,8 @@ load:
 			}
 			if (def == S_DEF_USER) {
 				sym = sym_find(line + 7);
-				if (!sym) {
-					conf_warning("trying to assign nonexistent symbol %s", line + 7);
+				if (!sym)
 					break;
-				}
 			} else {
 				sym = sym_lookup(line + 7, 0);
 				if (sym->type == S_UNKNOWN)

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

I wrote:
> > Sam Ravnborg (1):
> >       Kconfig: add KBUILD_DEFCONFIG to DEFCONFIG_LIST
> 
> And this commit caused my make to enter an
> infinite looke calling scripts/kconfig/conf -s arch/x86/Kconfig
> Reproduceable by:
> make defconfig
> make

The problem was that the environment variable KBUILD_DEFCONFIG
in some cases were not defined and in other cases it was defined.
Fixing this is non-trivial.

So I reverted back to a solution where we have one config symbol
defined in the ARCH specific Kconfig file.
For now only x86 uses this.

Please pull from:

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

to receive the following updates:

Gabriel C (1):
      scripts/ver_linux use 'gcc -dumpversion'

Jike Song (1):
      .gitignore: match ncscope.out

Sam Ravnborg (1):
      Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST

 .gitignore        |    1 +
 arch/x86/Kconfig  |   13 +++----------
 init/Kconfig      |    1 +
 scripts/ver_linux |    5 +----
 4 files changed, 6 insertions(+), 14 deletions(-)


diff --git a/.gitignore b/.gitignore
index 9c0d650..d24ad50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 *.orig
 *~
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fe361ae..dcbec34 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,17 +26,10 @@ config X86
 	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
 	select HAVE_ARCH_KGDB if !X86_VOYAGER
 
-config DEFCONFIG_LIST
+config ARCH_DEFCONFIG
 	string
-	depends on X86_32
-	option defconfig_list
-	default "arch/x86/configs/i386_defconfig"
-
-config DEFCONFIG_LIST
-	string
-	depends on X86_64
-	option defconfig_list
-	default "arch/x86/configs/x86_64_defconfig"
+	default "arch/x86/configs/i386_defconfig" if X86_32
+	default "arch/x86/configs/x86_64_defconfig" if X86_64
 
 
 config GENERIC_LOCKBREAK
diff --git a/init/Kconfig b/init/Kconfig
index 6135d07..6199d11 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST
 	default "/lib/modules/$UNAME_RELEASE/.config"
 	default "/etc/kernel-config"
 	default "/boot/config-$UNAME_RELEASE"
+	default "$ARCH_DEFCONFIG"
 	default "arch/$ARCH/defconfig"
 
 menu "General setup"
diff --git a/scripts/ver_linux b/scripts/ver_linux
index ab69ece..7ac0e30 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -12,12 +12,9 @@ echo ' '
 uname -a
 echo ' '
 
-gcc --version 2>&1| head -n 1 | grep -v gcc | awk \
+gcc -dumpversion 2>&1| awk \
 'NR==1{print "Gnu C                 ", $1}'
 
-gcc --version 2>&1| grep gcc | awk \
-'NR==1{print "Gnu C                 ", $3}'
-
 make --version 2>&1 | awk -F, '{print $1}' | awk \
       '/GNU Make/{print "Gnu make              ",$NF}'
 

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

On Sun, May 25, 2008 at 09:12:28AM +0200, Sam Ravnborg wrote:
> Hi Linus.
> 
> Please pull from:
> 
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
> 
> This fixes the 'make oldconfig' regression you reported.
> And in addition a small .gitignore and ver_linux update.
> 
> 	Sam
> 
> The pull includes the following patches:
> 
> Gabriel C (1):
>       scripts/ver_linux use 'gcc -dumpversion'
> 
> Jike Song (1):
>       .gitignore: match ncscope.out
> 
> Sam Ravnborg (1):
>       Kconfig: add KBUILD_DEFCONFIG to DEFCONFIG_LIST

And this commit caused my make to enter an
infinite looke calling scripts/kconfig/conf -s arch/x86/Kconfig
Reproduceable by:
make defconfig
make

[on my 32 bit x86]

May try to dig into this later tonight.

For now I have dropped all commits from kbuild-fixes.git so
the bad commit does not end up in -linus, -next or -mm.

	Sam

[GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

Please pull from:

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

This fixes the 'make oldconfig' regression you reported.
And in addition a small .gitignore and ver_linux update.

	Sam

The pull includes the following patches:

Gabriel C (1):
      scripts/ver_linux use 'gcc -dumpversion'

Jike Song (1):
      .gitignore: match ncscope.out

Sam Ravnborg (1):
      Kconfig: add KBUILD_DEFCONFIG to DEFCONFIG_LIST


 .gitignore        |    1 +
 arch/x86/Kconfig  |   13 -------------
 init/Kconfig      |   11 ++++++++++-
 scripts/ver_linux |    5 +----
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c0d650..d24ad50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 *.orig
 *~
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fe361ae..6a4b98e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,19 +26,6 @@ config X86
 	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
 	select HAVE_ARCH_KGDB if !X86_VOYAGER
 
-config DEFCONFIG_LIST
-	string
-	depends on X86_32
-	option defconfig_list
-	default "arch/x86/configs/i386_defconfig"
-
-config DEFCONFIG_LIST
-	string
-	depends on X86_64
-	option defconfig_list
-	default "arch/x86/configs/x86_64_defconfig"
-
-
 config GENERIC_LOCKBREAK
 	def_bool n
 
diff --git a/init/Kconfig b/init/Kconfig
index 6135d07..2aa7180 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -6,6 +6,14 @@ config KERNELVERSION
 	string
 	option env="KERNELVERSION"
 
+config KBUILD_DEFCONFIG
+	string
+	option env="KBUILD_DEFCONFIG"
+
+config SRCARCH
+	string
+	option env="SRCARCH"
+
 config DEFCONFIG_LIST
 	string
 	depends on !UML
@@ -13,7 +21,8 @@ config DEFCONFIG_LIST
 	default "/lib/modules/$UNAME_RELEASE/.config"
 	default "/etc/kernel-config"
 	default "/boot/config-$UNAME_RELEASE"
-	default "arch/$ARCH/defconfig"
+	default "arch/$SRCARCH/configs/$KBUILD_DEFCONFIG"
+	default "arch/$SRCARCH/defconfig"
 
 menu "General setup"
 
diff --git a/scripts/ver_linux b/scripts/ver_linux
index ab69ece..7ac0e30 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -12,12 +12,9 @@ echo ' '
 uname -a
 echo ' '
 
-gcc --version 2>&1| head -n 1 | grep -v gcc | awk \
+gcc -dumpversion 2>&1| awk \
 'NR==1{print "Gnu C                 ", $1}'
 
-gcc --version 2>&1| grep gcc | awk \
-'NR==1{print "Gnu C                 ", $3}'
-
 make --version 2>&1 | awk -F, '{print $1}' | awk \
       '/GNU Make/{print "Gnu make              ",$NF}'
 

[GIT PULL] kbuild fixes

[Sam Ravnborg]

Hi Linus.

Please pull the following kbuild fixes from:

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

Adrian Bunk (1):
      kconfig-language.txt: remove bogus hint

Jean Delvare (1):
      modpost: i2c aliases need no trailing wildcard

Sam Ravnborg (1):
      kconfig: fix MAC OS X warnings in menuconfig


	Sam


 Documentation/kbuild/kconfig-language.txt |   24 -------------------
 scripts/kconfig/lkc.h                     |    6 ++--
 scripts/kconfig/mconf.c                   |    3 +-
 scripts/mod/file2alias.c                  |   35 +++++++++++++++++++++-------
 4 files changed, 31 insertions(+), 37 deletions(-)



diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index 00b950d..c412c24 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -377,27 +377,3 @@ config FOO
 
 limits FOO to module (=m) or disabled (=n).
 
-
-Build limited by a third config symbol which may be =y or =m
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-A common idiom that we see (and sometimes have problems with) is this:
-
-When option C in B (module or subsystem) uses interfaces from A (module
-or subsystem), and both A and B are tristate (could be =y or =m if they
-were independent of each other, but they aren't), then we need to limit
-C such that it cannot be built statically if A is built as a loadable
-module.  (C already depends on B, so there is no dependency issue to
-take care of here.)
-
-If A is linked statically into the kernel image, C can be built
-statically or as loadable module(s).  However, if A is built as loadable
-module(s), then C must be restricted to loadable module(s) also.  This
-can be expressed in kconfig language as:
-
-config C
-	depends on A = y || A = B
-
-or for real examples, use this command in a kernel tree:
-
-$ find . -name Kconfig\* | xargs grep -ns "depends on.*=.*||.*=" | grep -v orig
-
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 4bc68f2..96521cb 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -11,9 +11,9 @@
 #ifndef KBUILD_NO_NLS
 # include <libintl.h>
 #else
-# define gettext(Msgid) ((const char *) (Msgid))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+static inline const char *gettext(const char *txt) { return txt; }
+static inline void textdomain(const char *domainname) {}
+static inline void bindtextdomain(const char *name, const char *dir) {}
 #endif
 
 #ifdef __cplusplus
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 734cf4f..6841e95 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -773,7 +773,7 @@ static void conf_string(struct menu *menu)
 
 	while (1) {
 		int res;
-		char *heading;
+		const char *heading;
 
 		switch (sym_get_type(menu->sym)) {
 		case S_INT:
@@ -925,3 +925,4 @@ int main(int ac, char **av)
 
 	return 0;
 }
+
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e04c421..cea4a79 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -51,6 +51,15 @@ do {                                                            \
                 sprintf(str + strlen(str), "*");                \
 } while(0)
 
+/* Always end in a wildcard, for future extension */
+static inline void add_wildcard(char *str)
+{
+	int len = strlen(str);
+
+	if (str[len - 1] != '*')
+		strcat(str + len, "*");
+}
+
 unsigned int cross_build = 0;
 /**
  * Check that sizeof(device_id type) are consistent with size of section
@@ -133,9 +142,7 @@ static void do_usb_entry(struct usb_device_id *id,
 	    id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
 	    id->bInterfaceProtocol);
 
-	/* Always end in a wildcard, for future extension */
-	if (alias[strlen(alias)-1] != '*')
-		strcat(alias, "*");
+	add_wildcard(alias);
 	buf_printf(&mod->dev_table_buf,
 		   "MODULE_ALIAS(\"%s\");\n", alias);
 }
@@ -219,6 +226,7 @@ static int do_ieee1394_entry(const char *filename,
 	ADD(alias, "ver", id->match_flags & IEEE1394_MATCH_VERSION,
 	    id->version);
 
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -261,6 +269,7 @@ static int do_pci_entry(const char *filename,
 	ADD(alias, "bc", baseclass_mask == 0xFF, baseclass);
 	ADD(alias, "sc", subclass_mask == 0xFF, subclass);
 	ADD(alias, "i", interface_mask == 0xFF, interface);
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -283,6 +292,7 @@ static int do_ccw_entry(const char *filename,
 	    id->dev_type);
 	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
 	    id->dev_model);
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -290,7 +300,7 @@ static int do_ccw_entry(const char *filename,
 static int do_ap_entry(const char *filename,
 		       struct ap_device_id *id, char *alias)
 {
-	sprintf(alias, "ap:t%02X", id->dev_type);
+	sprintf(alias, "ap:t%02X*", id->dev_type);
 	return 1;
 }
 
@@ -309,6 +319,7 @@ static int do_serio_entry(const char *filename,
 	ADD(alias, "id", id->id != SERIO_ANY, id->id);
 	ADD(alias, "ex", id->extra != SERIO_ANY, id->extra);
 
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -316,7 +327,7 @@ static int do_serio_entry(const char *filename,
 static int do_acpi_entry(const char *filename,
 			struct acpi_device_id *id, char *alias)
 {
-	sprintf(alias, "acpi*:%s:", id->id);
+	sprintf(alias, "acpi*:%s:*", id->id);
 	return 1;
 }
 
@@ -324,7 +335,7 @@ static int do_acpi_entry(const char *filename,
 static int do_pnp_entry(const char *filename,
 			struct pnp_device_id *id, char *alias)
 {
-	sprintf(alias, "pnp:d%s", id->id);
+	sprintf(alias, "pnp:d%s*", id->id);
 	return 1;
 }
 
@@ -409,6 +420,7 @@ static int do_pcmcia_entry(const char *filename,
        ADD(alias, "pc", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID3, id->prod_id_hash[2]);
        ADD(alias, "pd", id->match_flags & PCMCIA_DEV_ID_MATCH_PROD_ID4, id->prod_id_hash[3]);
 
+	add_wildcard(alias);
        return 1;
 }
 
@@ -432,6 +444,7 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
         if (isspace (*tmp))
             *tmp = '_';
 
+    add_wildcard(alias);
     return 1;
 }
 
@@ -448,6 +461,7 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
 		if (isspace (*tmp))
 			*tmp = '_';
 
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -511,6 +525,8 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
 {
 	if (eisa->sig[0])
 		sprintf(alias, EISA_DEVICE_MODALIAS_FMT "*", eisa->sig);
+	else
+		strcat(alias, "*");
 	return 1;
 }
 
@@ -529,6 +545,7 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
 	ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev);
 	ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion);
 
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -544,6 +561,7 @@ static int do_sdio_entry(const char *filename,
 	ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class);
 	ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor);
 	ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device);
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -559,6 +577,7 @@ static int do_ssb_entry(const char *filename,
 	ADD(alias, "v", id->vendor != SSB_ANY_VENDOR, id->vendor);
 	ADD(alias, "id", id->coreid != SSB_ANY_ID, id->coreid);
 	ADD(alias, "rev", id->revision != SSB_ANY_REV, id->revision);
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -573,6 +592,7 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
 	ADD(alias, "d", 1, id->device);
 	ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor);
 
+	add_wildcard(alias);
 	return 1;
 }
 
@@ -612,9 +632,6 @@ static void do_table(void *symval, unsigned long size,
 
 	for (i = 0; i < size; i += id_size) {
 		if (do_entry(mod->name, symval+i, alias)) {
-			/* Always end in a wildcard, for future extension */
-			if (alias[strlen(alias)-1] != '*')
-				strcat(alias, "*");
 			buf_printf(&mod->dev_table_buf,
 				   "MODULE_ALIAS(\"%s\");\n", alias);
 		}

Re: [GIT PULL] kbuild fixes

[Adrian Bunk]

On Sat, Apr 26, 2008 at 09:37:01PM +0200, Sam Ravnborg wrote:
> On Sat, Apr 26, 2008 at 10:20:37PM +0300, Adrian Bunk wrote:
> > On Sat, Apr 26, 2008 at 09:12:56PM +0200, Sam Ravnborg wrote:
> > > 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)
> 
> 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.

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

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

> 	Sam

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

Re: [GIT PULL] kbuild fixes

[Adrian Bunk]

On Sat, Apr 26, 2008 at 09:49:04PM +0200, Sam Ravnborg wrote:
> On Sat, Apr 26, 2008 at 09:37:01PM +0200, Sam Ravnborg wrote:
> > On Sat, Apr 26, 2008 at 10:20:37PM +0300, Adrian Bunk wrote:
> > > On Sat, Apr 26, 2008 at 09:12:56PM +0200, Sam Ravnborg wrote:
> > > > 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)
> > 
> > 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.
> 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.

> 	Sam

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

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

On Sat, Apr 26, 2008 at 09:37:01PM +0200, Sam Ravnborg wrote:
> On Sat, Apr 26, 2008 at 10:20:37PM +0300, Adrian Bunk wrote:
> > On Sat, Apr 26, 2008 at 09:12:56PM +0200, Sam Ravnborg wrote:
> > > 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)
> 
> 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.
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

Re: [GIT PULL] kbuild fixes

[Sam Ravnborg]

On Sat, Apr 26, 2008 at 10:20:37PM +0300, Adrian Bunk wrote:
> On Sat, Apr 26, 2008 at 09:12:56PM +0200, Sam Ravnborg wrote:
> > 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)

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

Re: [GIT PULL] kbuild fixes

[Adrian Bunk]

On Sat, Apr 26, 2008 at 09:12:56PM +0200, Sam Ravnborg wrote:
> 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)

> 	Sam

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

[GIT PULL] kbuild fixes

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

	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;