Subject: Re: linux-next: Tree for May 2 (uml builds fail)

From: Michal Marek <[email-masked]>
Date: Mon, 2 May 2011 18:04:05 +0200

On Mon, May 02, 2011 at 08:19:48AM -0700, Randy Dunlap wrote:
> On Mon, 2 May 2011 15:01:50 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20110429:
> 
> 
> uml builds on i386 or x86_64 fail with: (I'm using O=outputdir if it matters)
> 
>   GEN     /lnx/src/NEXT/linux-next-20110502/UM64/Makefile
> scripts/kconfig/conf --silentoldconfig arch/um/Kconfig.x86
>   GEN     /lnx/src/NEXT/linux-next-20110502/UM64/Makefile
> /lnx/src/NEXT/linux-next-20110502/scripts/Makefile.asm-generic:9: /lnx/src/NEXT/linux-next-20110502/arch/um/include/asm/Kbuild: No such file or directory
> make[2]: *** No rule to make target `/lnx/src/NEXT/linux-next-20110502/arch/um/include/asm/Kbuild'.  Stop.

This patch should fix it.

Michal

Subject: [PATCH] kbuild: Fix Makefile.asm-generic for um

Do nothing if arch/$(SRCARCH)/include/asm/Kbuild does not exist, which
is the case of um.

Reported-by: Randy Dunlap <[email-masked]>
Signed-off-by: Michal Marek <[email-masked]>

diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index a687cb6..490122c 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -6,7 +6,7 @@
 # a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
 
 kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
-include $(kbuild-file)
+-include $(kbuild-file)
 
 include scripts/Kbuild.include