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 1509723517889300.1629914390536; Fri, 3 Nov 2017 08:38:37 -0700 (PDT) Received: from localhost ([::1]:37220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAe31-0003aa-Ts for importer@patchew.org; Fri, 03 Nov 2017 11:38:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAdyh-000854-Kw for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAdye-0001Ee-Hm for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11550) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAdye-0001E2-BK for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 613752CE979; Fri, 3 Nov 2017 15:33:47 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E1160460; Fri, 3 Nov 2017 15:33:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 613752CE979 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 15:33:32 +0000 Message-Id: <20171103153333.6416-5-berrange@redhat.com> In-Reply-To: <20171103153333.6416-1-berrange@redhat.com> References: <20171103153333.6416-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 03 Nov 2017 15:33:47 +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 v3 4/5] build: don't fail if given a git submodule which does not exist 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" If going back in time in git history, across a commit that introduces a new submodule, the 'git-submodule.sh' script will fail, causing rebuild to fail. This is because config-host.mak contains a GIT_SUBMODULES variable that lis= ts a submodule that only exists in the later commit. config-host.mak won't get repopulated until config.status is invoked, but make won't get this far due= to the submodule error. This change makes 'git-submodule.sh' check whether each module is known to = git and drops any which are not present. A warning message will be printed when= any submodule is dropped in this manner. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- scripts/git-submodule.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index 63ace6fc55..2857fc57c4 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -7,7 +7,7 @@ substat=3D".git-submodule-status" =20 command=3D$1 shift -modules=3D"$@" +maybe_modules=3D"$@" =20 test -z "$GIT" && GIT=3Dgit =20 @@ -33,12 +33,24 @@ error() { exit 1 } =20 -if test -z "$modules" +if test -z "$maybe_modules" then test -e $substat || touch $substat exit 0 fi =20 +modules=3D"" +for m in $maybe_modules +do + $GIT submodule status $m 1> /dev/null 2>&1 + if test $? =3D 0 + then + modules=3D"$modules $m" + else + echo "warn: ignoring non-existant submodule $m" + fi +done + if ! test -e ".git" then echo "$0: unexpectedly called with submodules but no git checkout exis= ts" --=20 2.13.6