Don't hardcode list of git submodules

[libvirt] [PATCH] Don't hardcode list of git submodules

Posted by Andrea Bolognani 5 years ago

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 Makefile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.ci b/Makefile.ci
index 738da53cc8..864948dc96 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -44,7 +44,7 @@ CI_CONFIGURE_ARGS =
 
 # Avoid pulling submodules over the network by locally
 # cloning them
-CI_SUBMODULES = .gnulib src/keycodemapdb
+CI_SUBMODULES = $(shell git submodules | awk '{ print $2 }')
 
 # Location of the Docker images we're going to pull
 # Can be useful to overridde to use a locally built
-- 
2.20.1

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

Re: [libvirt] [PATCH] Don't hardcode list of git submodules

Posted by Daniel P. Berrangé 5 years ago

On Mon, Apr 15, 2019 at 02:46:19PM +0200, Andrea Bolognani wrote:
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  Makefile.ci | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.ci b/Makefile.ci
> index 738da53cc8..864948dc96 100644
> --- a/Makefile.ci
> +++ b/Makefile.ci
> @@ -44,7 +44,7 @@ CI_CONFIGURE_ARGS =
>  
>  # Avoid pulling submodules over the network by locally
>  # cloning them
> -CI_SUBMODULES = .gnulib src/keycodemapdb
> +CI_SUBMODULES = $(shell git submodules | awk '{ print $2 }')

s/submodules/submodule/

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

Re: [libvirt] [PATCH] Don't hardcode list of git submodules

Posted by Andrea Bolognani 5 years ago

On Mon, 2019-04-15 at 13:58 +0100, Daniel P. Berrangé wrote:
> On Mon, Apr 15, 2019 at 02:46:19PM +0200, Andrea Bolognani wrote:
> > +CI_SUBMODULES = $(shell git submodules | awk '{ print $2 }')
> 
> s/submodules/submodule/

Yeah, and that '$' in '$2' needs to be quoted for it to work :/
I thought I tested this, but realized now that I was on a different
branch :/

Will fix both before pushing.

-- 
Andrea Bolognani / Red Hat / Virtualization

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

Re: [libvirt] [PATCH] Don't hardcode list of git submodules

Posted by Martin Kletzander 5 years ago

On Mon, Apr 15, 2019 at 02:46:19PM +0200, Andrea Bolognani wrote:
>Signed-off-by: Andrea Bolognani <abologna@redhat.com>
>---
> Makefile.ci | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/Makefile.ci b/Makefile.ci
>index 738da53cc8..864948dc96 100644
>--- a/Makefile.ci
>+++ b/Makefile.ci
>@@ -44,7 +44,7 @@ CI_CONFIGURE_ARGS =
>
> # Avoid pulling submodules over the network by locally
> # cloning them
>-CI_SUBMODULES = .gnulib src/keycodemapdb
>+CI_SUBMODULES = $(shell git submodules | awk '{ print $2 }')
>

Possibly "git submodule status --recursive"?

> # Location of the Docker images we're going to pull
> # Can be useful to overridde to use a locally built
>-- 
>2.20.1
>
>--
>libvir-list mailing list
>libvir-list@redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Don't hardcode list of git submodules

Posted by Andrea Bolognani 5 years ago

On Mon, 2019-04-15 at 15:11 +0200, Martin Kletzander wrote:
> On Mon, Apr 15, 2019 at 02:46:19PM +0200, Andrea Bolognani wrote:
> > +CI_SUBMODULES = $(shell git submodules | awk '{ print $2 }')
> 
> Possibly "git submodule status --recursive"?

If we started using nested submodules we'd have to be smart about
the order used when cloning as well, so I say let's cross that
bridge when we come to it.

Also: nested submodules, ewww.

-- 
Andrea Bolognani / Red Hat / Virtualization

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