From nobody Sat Nov 1 22:30:13 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1509023158432316.04888139267666; Thu, 26 Oct 2017 06:05:58 -0700 (PDT) Received: from localhost ([::1]:52801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7hqm-0005w7-LX for importer@patchew.org; Thu, 26 Oct 2017 09:05:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7hpt-0005b8-0P for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7hpo-0006LA-TJ for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:04:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7hpo-0006KF-KY for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:04:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7AEFAC070E39; Thu, 26 Oct 2017 13:04:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-204-126.brq.redhat.com [10.40.204.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C3605DD6D; Thu, 26 Oct 2017 13:04:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7AEFAC070E39 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 26 Oct 2017 14:04:26 +0100 Message-Id: <20171026130426.10626-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 26 Oct 2017 13:04:31 +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: allow automatic git submodule updates to be disabled 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: Alexey Kardashevskiy , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some people building QEMU use VPATH builds where the source directory is on= a read-only volume. In such a case 'scripts/git-submodules.sh update' will al= ways fail and users are required to run it manually themselves on their original writable source directory. While this is already supported, it is nice to give users a command line fl= ag to configure to permanently disable automatic submodule updates, as it means they won't get hard to diagnose failures from git-submodules.sh at an arbit= rary later date. This patch thus introduces a flag '--disable-git-update' which will prevent 'make' from ever running 'scripts/git-submodules.sh update'. It will still = run the 'status' command to determine if a submodule update is needed, but when= it does this it'll simply stop and print a message instructing the developer w= hat todo. eg $ ./configure --target-list=3Dx86_64-softmmu --disable-git-update ...snip... $ make GEN config-host.h GEN trace/generated-tcg-tracers.h GEN trace/generated-helpers-wrappers.h GEN trace/generated-helpers.h GEN trace/generated-helpers.c GEN module_block.h GIT submodule checkout is out of date. Please run scripts/git-submodule.sh update ui/keycodemapdb from the source directory checkout /home/berrange/src/virt/qemu make: *** [Makefile:31: git-submodule-update] Error 1 Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 11 +++++++++++ configure | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4c9d0eaef2..cefb75dc8d 100644 --- a/Makefile +++ b/Makefile @@ -26,12 +26,23 @@ ifeq (0,$(MAKELEVEL)) ) =20 ifeq (1,$(git_module_status)) +ifeq (no,$(GIT_UPDATE)) +git-submodule-update: + $(call quiet-command, \ + echo && \ + echo "GIT submodule checkout is out of date. Please run" && \ + echo " scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \ + echo "from the source directory checkout $(SRC_PATH)" && \ + echo && \ + exit 1) +else git-submodule-update: $(call quiet-command, \ (cd $(SRC_PATH) && GIT=3D"$(GIT)" ./scripts/git-submodule.sh upd= ate $(GIT_SUBMODULES)), \ "GIT","$(GIT_SUBMODULES)") endif endif +endif =20 .git-submodule-status: git-submodule-update config-host.mak =20 diff --git a/configure b/configure index ce5a2d0105..2e3b5fc145 100755 --- a/configure +++ b/configure @@ -267,8 +267,10 @@ stack_protector=3D"" =20 if test -e "$source_path/.git" then + git_update=3Dyes git_submodules=3D"ui/keycodemapdb" else + git_update=3Dno git_submodules=3D"" fi git=3D"git" @@ -1297,11 +1299,15 @@ for opt do ;; --with-git=3D*) git=3D"$optarg" ;; + --enable-git-update) git_update=3Dyes + ;; + --disable-git-update) git_update=3Dno + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" exit 1 - ;; + ;; esac done =20 @@ -5534,6 +5540,7 @@ echo "qemu_localedir=3D$qemu_localedir" >> $config_ho= st_mak echo "libs_softmmu=3D$libs_softmmu" >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak +echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 --=20 2.13.6