From nobody Sun May 5 15:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=eu.citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1591112962; cv=none; d=zohomail.com; s=zohoarc; b=leoe3Yb6yU7iuLw08SJlWw/HDDjqLq3HfUEX4HBPIh++V95yDR7NexF4sd7iGyFHfKS0Zv4dxQmPsPspeLbGWwbvXNanIDxQrgBb/nfAa9awsU/13f/SIwknqSWQwp6GCPTZRIpdHtHlyOOeXD1DkR8ZTkqjPLHCBq/FhPG4+L8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591112962; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=HxqZHDEn1Ftz4sY0ZCrMXoAERboF/dlnp/2VX2gDJPI=; b=Gy9ey9/iGZLc3Yekphy2yatP+u3aM0jUGa85FwENpJvNtrZIuuICQ6QDjQWC5Ty05JyeajEPVIGDf+q52F/JdirVGl4+WleHNG+inHk9AXsUAlMii+oLB7RLn6py4i8B5n+L5tLQMxcbXhkyEUk52X5icEBuR/qRUwjimj3EIYA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1591112962572178.23288357616457; Tue, 2 Jun 2020 08:49:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-443--MwiTRFjN9KGirsg_YqjwA-1; Tue, 02 Jun 2020 11:49:18 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E7A3100CD02; Tue, 2 Jun 2020 15:49:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1AD2C19C4F; Tue, 2 Jun 2020 15:49:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A334297018; Tue, 2 Jun 2020 15:49:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 052Fn8pl021637 for ; Tue, 2 Jun 2020 11:49:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id DE98D2156A54; Tue, 2 Jun 2020 15:49:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D11002156A49 for ; Tue, 2 Jun 2020 15:49:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DC560108C267 for ; Tue, 2 Jun 2020 15:49:04 +0000 (UTC) Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-eMe9-HCTMOayNpuON9HgHQ-1; Tue, 02 Jun 2020 11:49:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591112961; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=HxqZHDEn1Ftz4sY0ZCrMXoAERboF/dlnp/2VX2gDJPI=; b=D5MENYBGmNg7WuIyQQArJRonp9dLYb4xjXN4TVdyfgoSuooWB2f87uYjakwRcTsvkKef9Q oNGEN1pvNTO4quLel0GVpCijvi5IZEW/asabsis9fl9YziFj1aZRKBNZslsM1Au5JNS9Xp QNJ5TwKYB0H0mltgo0wkiAGDfgbaNss= X-MC-Unique: -MwiTRFjN9KGirsg_YqjwA-1 X-MC-Unique: eMe9-HCTMOayNpuON9HgHQ-1 IronPort-SDR: WG0yBtzVoLjaZ8Z0nvlOcMIIOaHUvHbOHixTxHma52lOACGW/5wkEke0E6aEl9RtN1UbMcnHxZ jRxXPDRo1mCWOi7kCr3zsQlw3+AG4hjXxvZQmtlUZm3Zq9nIdb7ainGi+Yt+o9o+iw+ZjD68e6 WGiG6TGkMU0941sR/g1FSas90YJXHuGRpbvXzwvL6GQjYU9Kgovj7qA9GUnQpUXjB2UqkjkhS5 +VvzstNUWGmDztKIUb+gwjPpYPnatZ8VW0wyQxip3jbmRu1PWldEQEhnD6rYYubnSGbBWOUU04 Vp0= X-SBRS: 2.7 X-MesageID: 19386188 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.73,465,1583211600"; d="scan'208";a="19386188" From: Ian Jackson To: Subject: [PATCH] autogen.sh: Restore --no-git (avoid git submodule update) Date: Tue, 2 Jun 2020 16:47:45 +0100 Message-ID: <20200602154745.15054-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: xen-devel@lists.xenproject.org, Ian Jackson , George Dunlap X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prior to 2621d48f005a "gnulib: delete all gnulib integration", one could pass ./autogen.sh --no-git to prevent the libvirt build system from running git submodule update. This feature is needed by systems like the Xen Project CI which want to explicitly control the revisions of every tree. These will typically arrange to initialise the submodules check out the right version of everything, and then expect the build system not to mess with it any more. Despite to the old documentation comments referring only to gnulib, the --no-git feature is required not only because of gnulib but also because of the other submodule, src/keycodemapdb. (And in any case, even if it were no longer required because all the submodules were removed, it ought ideally to have been retained as a no-op for compaibility reasons.) So restore the --no-git feature. Because of the way the argument parsing of autogen.sh works, it is easiest to recognise this option only if it comes first. This works for the Xen Project CI, which has always passed this option first. If something else is using this option (and hasn't introduced a different workaround in the meantime), not in the first position, then perhaps a more sophisticated approach will be needed. But I think this will do for now. Signed-off-by: Ian Jackson Reviewed-by: Pavel Hrdina --- autogen.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 4e1bbceb0a..1c98273452 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,10 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +# +# THe following options must come first. All other or subsequent +# arguments are passed to configure: +# --no-git skip `git submodule update --init` + test -n "$srcdir" || srcdir=3D$(dirname "$0") test -n "$srcdir" || srcdir=3D. =20 @@ -13,7 +18,11 @@ cd "$srcdir" exit 1 } =20 -git submodule update --init || exit 1 +if [ "x$1" =3D x--no-git ]; then + shift +else + git submodule update --init || exit 1 +fi =20 autoreconf --verbose --force --install || exit 1 =20 --=20 2.11.0