From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 10 Feb 2020 17:02:55 +0000 (+0100)
Subject: ci: Make container environment available to scripts
X-Git-Tag: v6.1.0-rc1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71517ae4db35c4dcc6c358d60d3a6d5da0615d39;p=thirdparty%2Flibvirt.git

ci: Make container environment available to scripts

For container images targeted at cross-building, we bake a small
amount of architecture-specific information in the environment so
that builds can work as expected without requiring additional work
from the user; unfortunately this information got lost as soon as
we called sudo. Explicitly allow it.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/ci/Makefile b/ci/Makefile
index acb655941c..03799924b4 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -220,6 +220,8 @@ ci-run-command@%: ci-prepare-tree
 		  --login \
 		  --user="#$(CI_UID)" \
 		  --group="#$(CI_GID)" \
+		  CONFIGURE_OPTS="$$CONFIGURE_OPTS" \
+		  PKG_CONFIG_LIBDIR="$$PKG_CONFIG_LIBDIR" \
 		  CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
 		  CI_CONT_BUILDDIR="$(CI_CONT_BUILDDIR)" \
 		  CI_SMP="$(CI_SMP)" \