From nobody Wed Apr 24 11:59:51 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578558003; cv=none; d=zohomail.com; s=zohoarc; b=gKLCxApVPYUe1En5OAcnnimhiq3j97N6gvPkIXsStQMDRBNbWwd2MM2X6AY9vgBCCmf4XvXK0ui3nMT64sa0P0M79W6xhVuY4yD+PomeGK3ht1RTPEvkRK4q30hXzY9pSAEMNmanevM/8vwXw3mnWcdGD92yzvCkjjJW2xzbskg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578558003; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IwFf9ZnzsEI2SBB1nA1lnE2tg0uhCSLem+DGl9nWfhU=; b=Q0WjfTqJVnTbQRaStyB7sY9RGToreRuiOJ+SKgjCl+oVFS3Zu7BatGj7io075/KjkxaurPBd5WszhhAS+y5Br03OWpYKtDWccvtOLjZOyVOFO/cPsSQ4SW8Xemm/bxSHC88Z7nM9Io4uMJEuyh9dEW3qM9osQE4+Ru1lgppT8AM= 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=pass 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 1578558003184668.1102729207056; Thu, 9 Jan 2020 00:20:03 -0800 (PST) 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-185-_P_k1zJtPGe0pUFXHckq0A-1; Thu, 09 Jan 2020 03:19:12 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B20B810054E3; Thu, 9 Jan 2020 08:19:04 +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 7C1B97C3C6; Thu, 9 Jan 2020 08:19:04 +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 04B09503C0; Thu, 9 Jan 2020 08:19:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0098Ijnj014880 for ; Thu, 9 Jan 2020 03:18:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 07A7A1001B2C; Thu, 9 Jan 2020 08:18:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 825B61001925 for ; Thu, 9 Jan 2020 08:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578558002; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IwFf9ZnzsEI2SBB1nA1lnE2tg0uhCSLem+DGl9nWfhU=; b=A5qKHa5oUaTBjX0DooP4b8dNawj1jbFcNf9ChxwSgG+RYB7CIg2HT1QrI5rC/BiVV3VEg+ c4hVulrUd9uDNiS3mSFdkcFsj+68ngKnK8subKeSIkBBFHvCZ8riElaTbnHOpP1Gf49MNh I9fjGQONJvXTNi85u+AR5w1SoVLA+VY= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 09:16:46 +0100 Message-Id: <0d824bd5c92caac679fcb4f8c0bb513c672e29fa.1578556319.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/16] autogen.sh: remove --no-git and --gnulib-srcdir options 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.79 on 10.5.11.15 X-MC-Unique: _P_k1zJtPGe0pUFXHckq0A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that we have bootstrap output stored in git there is no need for these options. Signed-off-by: Pavel Hrdina --- autogen.sh | 38 +++----------------------------------- docs/compiling.html.in | 13 ------------- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/autogen.sh b/autogen.sh index 78c4320af5..b705b3f298 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,40 +18,8 @@ test -f src/libvirt.c || { die "$0 must live in the top-level libvirt directory" } =20 -no_git=3D -gnulib_srcdir=3D -while test "$#" -gt 0; do - case "$1" in - --no-git) - no_git=3D" $1" - shift - ;; - --gnulib-srcdir=3D*) - gnulib_srcdir=3D" $1" - shift - ;; - --gnulib-srcdir) - gnulib_srcdir=3D" $1=3D$2" - shift - shift - ;; - *) - # All remaining arguments will be passed to configure verbatim - break - ;; - esac -done -no_git=3D"$no_git$gnulib_srcdir" - gnulib_hash() { - local no_git=3D$1 - - if test "$no_git"; then - echo "no-git" - return - fi - # Compute the hash we'll use to determine whether rerunning bootstrap # is required. The first is just the SHA1 that selects a gnulib snapsh= ot. # The second ensures that whenever we change the set of gnulib modules= used @@ -78,7 +46,7 @@ if test -d .git || test -f .git; then esac done fi - if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then + if test "$CLEAN_SUBMODULE"; then echo "Cleaning up submodules..." git submodule foreach 'git clean -dfqx && git reset --hard' || { die "Cleaning up submodules failed" @@ -97,7 +65,7 @@ if test -d .git || test -f .git; then # successful bootstrap run, is stored on disk state_file=3D.git-module-status expected_hash=3D$(cat "$state_file" 2>/dev/null) - actual_hash=3D$(gnulib_hash "$no_git") + actual_hash=3D$(gnulib_hash) =20 if test "$actual_hash" =3D "$expected_hash"; then # The gnulib hash matches our expectations, and all the files @@ -114,7 +82,7 @@ if test -d .git || test -f .git; then # run bootstrap again. If we're performing a dry run, we # change the return code instead to signal our caller echo "Running bootstrap..." - ./bootstrap$no_git || { + ./bootstrap || { die "bootstrap failed" } gnulib_hash >"$state_file" diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 52fd5f5397..be1cc42189 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -80,19 +80,6 @@ $ sudo make install disk space requirements and network download time, regardless of which actual commit you have in that reference directory.

-

- However, if you are developing on a platform where git is not - available, or are behind a firewall that does not allow for git - to easily obtain the gnulib submodule, it is possible to instead - use a static mode of operation where you are then responsible - for updating the git submodule yourself. In this mode, you must - track the exact gnulib commit needed by libvirt (usually not the - latest gnulib.git) via alternative means, such as a shared NFS - drive or manual download, and run this any time libvirt.git - updates the commit stored in the .gnulib submodule:

- 
-$ GNULIB_SRCDIR=3D/path/to/gnulib ./autogen.sh --no-git
-
=20

To build & install libvirt to your home directory the following commands can be run: --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list