From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 15 Aug 2019 14:21:18 +0000 (+0200)
Subject: ci: Drop $(CI_SUBMODULES)
X-Git-Tag: v5.7.0-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75f5affde764e5decddce7b5d6eef46f2d824a2e;p=thirdparty%2Flibvirt.git

ci: Drop $(CI_SUBMODULES)

We only use the list of submodules once, so no need to
store it in a variable.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/Makefile.ci b/Makefile.ci
index ac859dcb95..b5d328ee8c 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -42,10 +42,6 @@ CI_MAKE_ARGS =
 # Any extra arguments to pass to configure
 CI_CONFIGURE_ARGS =
 
-# Avoid pulling submodules over the network by locally
-# cloning them
-CI_SUBMODULES = $(shell git submodule | awk '{ print $$2 }')
-
 # Location of the container images we're going to pull
 # Can be useful to overridde to use a locally built
 # image instead
@@ -186,7 +182,7 @@ ci-prepare-tree: ci-check-engine
 		cp /etc/group $(CI_SCRATCHDIR); \
 		echo "Cloning $(CI_GIT_ROOT) to $(CI_HOST_SRCDIR)"; \
 		git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT) $(CI_HOST_SRCDIR) || exit 1; \
-		for mod in $(CI_SUBMODULES) ; \
+		for mod in $$(git submodule | awk '{ print $$2 }') ; \
 		do \
 			test -f $(CI_GIT_ROOT)/$$mod/.git || continue ; \
 			echo "Cloning $(CI_GIT_ROOT)/$$mod to $(CI_HOST_SRCDIR)/$$mod"; \