From patchwork Thu Oct 19 14:29:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 10017273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E9B4600CC for ; Thu, 19 Oct 2017 14:32:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9214628D82 for ; Thu, 19 Oct 2017 14:32:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8521128D84; Thu, 19 Oct 2017 14:32:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8792128D82 for ; Thu, 19 Oct 2017 14:32:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5Bq6-0007fT-7x; Thu, 19 Oct 2017 14:30:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5Bq4-0007fM-JT for xen-devel@lists.xenproject.org; Thu, 19 Oct 2017 14:30:24 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 21/85-20813-FF6B8E95; Thu, 19 Oct 2017 14:30:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsXitHSDve7/bS8 iDXb8l7D4vmUykwOjx+EPV1gCGKNYM/OS8isSWDO2HFjNWrCTvWLu/B3MDYzL2LoYOTkkBPwl NkxpZgax2QQMJFZMv8rYxcjBISKgInF7r0EXIxcHs8ACRokPf96ygNQIC7hKrF/7ihHEZhFQl Xjz/gtYL6+AncSfSUuYIGbKS7xfcB+sRkhATeLGwmUsEDWCEidnPgGzmQUkJA6+eME8gZF7Fp LULCSpBYxMqxjVi1OLylKLdE31kooy0zNKchMzc3QNDcz0clOLixPTU3MSk4r1kvNzNzECQ4E BCHYwTr/sf4hRkoNJSZT3Y9WLSCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvD+2AuUEi1LTUyvS MnOAQQmTluDgURLhZQMGphBvcUFibnFmOkTqFKMxx42H1/8wcXTcvPuHSYglLz8vVUqc9y7IJ AGQ0ozSPLhBsGi5xCgrJczLCHSaEE9BalFuZgmq/CtGcQ5GJWFeKZCFPJl5JXD7XgGdwgR0Cr s92CkliQgpqQbGjfG2glHRkTYxM/f2Hjt9vX/h1/aML4H+Oy3sLqTcUo24HhF/11p1f4/Jx/U 9FfsiRe/pcmXG1GeXi8vqHxN7scZmYaHKwQWC0b0N/I2xDm79T/drl11xbFF+3lng7lpz7NHK HWHnjvoWa1fL/eY+tm2xpkLO0ckJcxUS/u7gal44jTmdR1+JpTgj0VCLuag4EQD5vuUTkQIAA A== X-Env-Sender: prvs=458e47f2f=anthony.perard@citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1508423421!77865940!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44734 invoked from network); 19 Oct 2017 14:30:23 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 19 Oct 2017 14:30:23 -0000 X-IronPort-AV: E=Sophos;i="5.43,402,1503360000"; d="scan'208";a="455021612" From: Anthony PERARD To: Date: Thu, 19 Oct 2017 15:29:56 +0100 Message-ID: <20171019142956.25563-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.14.2 MIME-Version: 1.0 Cc: Anthony PERARD , Wei Liu , Julien Grall , Ian Jackson Subject: [Xen-devel] [PATCH] tools/Makefile: unset MAKELEVEL before building QEMU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67 "build: automatically handle GIT submodule checkout for dtc" the QEMU makefiles rely on the variable MAKELEVEL to make a decision on whether to update some git submodules or not. Since we call QEMU build from within the Xen one, MAKELEVEL would already be greater than 0 and the git submodules would not be updated and QEMU would fail to build. Fix this by removing MAKELEVEL from the environment before trying to build QEMU. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile b/tools/Makefile index 84d6e3b4e4..ab7a01ee1b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -217,6 +217,7 @@ QEMU_XEN_ENABLE_DEBUG := endif subdir-all-qemu-xen-dir: qemu-xen-dir-find + unset MAKELEVEL; \ if test -d $(QEMU_UPSTREAM_LOC) ; then \ source=$(QEMU_UPSTREAM_LOC); \ else \