diff mbox

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

Message ID 20110502160405.GE15769@sepie.suse.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Michal Marek May 2, 2011, 4:04 p.m. UTC
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 <rdunlap@xenotime.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Randy Dunlap May 2, 2011, 4:09 p.m. UTC | #1
On Mon, 2 May 2011 18:04:05 +0200 Michal Marek wrote:

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

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.


> 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 <rdunlap@xenotime.net>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
> 
> 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
>  
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sam Ravnborg May 2, 2011, 4:52 p.m. UTC | #2
On Mon, May 02, 2011 at 06:04:05PM +0200, Michal Marek wrote:
> 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 <rdunlap@xenotime.net>
> Signed-off-by: Michal Marek <mmarek@suse.cz>

Makes sense - sorry for not catchign the um case!

Acked-by: Sam Ravnborg <sam@ravnborg.org>


	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michal Marek May 2, 2011, 8:33 p.m. UTC | #3
On 2.5.2011 18:52, Sam Ravnborg wrote:
> On Mon, May 02, 2011 at 06:04:05PM +0200, Michal Marek wrote:
>> 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 <rdunlap@xenotime.net>
>> Signed-off-by: Michal Marek <mmarek@suse.cz>
> 
> Makes sense - sorry for not catchign the um case!
> 
> Acked-by: Sam Ravnborg <sam@ravnborg.org>

Thanks, pushed to kbuild-2.6.git#kbuild.

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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