[v2] include result of bootstrap in git

[libvirt] [PATCH v2 05/12] bootstrap.conf: declare bootstrap sync in configuration file

Posted by Pavel Hrdina 4 years, 10 months ago

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 autogen.sh     | 2 +-
 bootstrap.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 9afad8f9d5..a119b099cb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -147,7 +147,7 @@ if test -d .git || test -f .git; then
             dry_run=2
         else
             echo "Running bootstrap..."
-            ./bootstrap$no_git --bootstrap-sync || {
+            ./bootstrap$no_git || {
                 die "bootstrap failed"
             }
             gnulib_hash >"$state_file"
diff --git a/bootstrap.conf b/bootstrap.conf
index 3798284dad..5e2e7b1310 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -129,6 +129,8 @@ SKIP_PO=true
 
 copy=true
 
+bootstrap_sync=true
+
 
 # Tell gnulib to:
 #   require LGPLv2+
-- 
2.24.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 05/12] bootstrap.conf: declare bootstrap sync in configuration file

Posted by Daniel P. Berrangé 4 years, 10 months ago

On Thu, Jan 09, 2020 at 03:53:15PM +0100, Pavel Hrdina wrote:
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  autogen.sh     | 2 +-
>  bootstrap.conf | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list