From patchwork Mon May 2 16:04:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 747602 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p42G48gr028340 for ; Mon, 2 May 2011 16:04:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753404Ab1EBQEI (ORCPT ); Mon, 2 May 2011 12:04:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52841 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752948Ab1EBQEH (ORCPT ); Mon, 2 May 2011 12:04:07 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 85C354844E; Mon, 2 May 2011 18:04:06 +0200 (CEST) Received: by sepie.suse.cz (Postfix, from userid 10020) id 86CD47661B; Mon, 2 May 2011 18:04:05 +0200 (CEST) Date: Mon, 2 May 2011 18:04:05 +0200 From: Michal Marek To: Randy Dunlap Cc: Stephen Rothwell , linux-kbuild@vger.kernel.org, linux-next@vger.kernel.org, LKML , sam@ravnborg.org Subject: Re: linux-next: Tree for May 2 (uml builds fail) Message-ID: <20110502160405.GE15769@sepie.suse.cz> References: <20110502150150.d932642f.sfr@canb.auug.org.au> <20110502081948.1ccb9aef.rdunlap@xenotime.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110502081948.1ccb9aef.rdunlap@xenotime.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 02 May 2011 16:04:08 +0000 (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 Signed-off-by: Michal Marek Acked-by: Randy Dunlap Acked-by: Sam Ravnborg --- 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 --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