]> xenbits.xensource.com Git - libvirt.git/commitdiff
ci: Make container environment available to scripts
authorAndrea Bolognani <abologna@redhat.com>
Mon, 10 Feb 2020 17:02:55 +0000 (18:02 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 24 Feb 2020 12:41:58 +0000 (13:41 +0100)
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>
ci/Makefile

index acb655941c95863428a6301da41deb967d0d04d0..03799924b430cc27d92fdb48e68a43ee62aa8d2c 100644 (file)
@@ -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)" \