From nobody Fri May 3 12:35:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509968568701712.8687684246264; Mon, 6 Nov 2017 03:42:48 -0800 (PST) Received: from localhost ([::1]:47607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBfnZ-0002vl-S2 for importer@patchew.org; Mon, 06 Nov 2017 06:42:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBfmm-0002dZ-5v for qemu-devel@nongnu.org; Mon, 06 Nov 2017 06:41:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBfmh-0003MU-Ly for qemu-devel@nongnu.org; Mon, 06 Nov 2017 06:41:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBfmh-0003LN-Fh for qemu-devel@nongnu.org; Mon, 06 Nov 2017 06:41:43 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 562846016F; Mon, 6 Nov 2017 11:41:42 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A7A260C8E; Mon, 6 Nov 2017 11:41:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 562846016F Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 6 Nov 2017 11:41:34 +0000 Message-Id: <20171106114134.10125-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 06 Nov 2017 11:41:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] build: remove use of MAKELEVEL optimization in submodule handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Makefile attempts to optimize the handling of submodules by using MAKEL= EVEL to only check the submodule status when running from the top level make invokation. This causes problems for people who are using a makefile of the= ir own to in turn invoke QEMU's makefile, as MAKELEVEL is already set to 1 (or more) when QEMU's makefile runs. This optimization should not really be needed, since the git-submodule.sh script is already used to detect if a submodule update is required. This by removing the MAKELEVEL check, we at most add an extra 'git-submodule.sh sta= tus' call to each make level, the overhead of which is lost in noise of building QEMU. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake Reviewed-by: Greg Kurz Tested-by: Greg Kurz --- NB this is on top of https://lists.gnu.org/archive/html/qemu-devel/2017-11/= msg00449.html Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a92d7b8e14..0496c5057a 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,11 @@ git-submodule-update: =20 .PHONY: git-submodule-update =20 -ifeq (0,$(MAKELEVEL)) - git_module_status :=3D $(shell \ - cd '$(SRC_PATH)' && \ - GIT=3D"$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \ - echo $$?; \ - ) +git_module_status :=3D $(shell \ + cd '$(SRC_PATH)' && \ + GIT=3D"$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \ + echo $$?; \ +) =20 ifeq (1,$(git_module_status)) ifeq (no,$(GIT_UPDATE)) @@ -42,7 +41,6 @@ git-submodule-update: "GIT","$(GIT_SUBMODULES)") endif endif -endif =20 .git-submodule-status: git-submodule-update config-host.mak =20 --=20 2.13.6