[libvirt-jenkins-ci PATCH 3/4] lcitool: Drop duplicated code

Andrea Bolognani abologna at redhat.com
Tue Feb 25 12:15:48 UTC 2020


Now that we no longer set $PKG_CONFIG_LIBDIR, there is no need to
have separate code paths for Debian and Fedora.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/lcitool | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guests/lcitool b/guests/lcitool
index 053e46a..80e725c 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -894,14 +894,7 @@ class Application:
             ENV LANG "en_US.UTF-8"
         """).format(**varmap))
 
-        if cross_arch and package_format == "deb":
-            sys.stdout.write(textwrap.dedent("""
-                ENV ABI "{cross_abi}"
-                ENV CONFIGURE_OPTS "--host={cross_abi} \\
-                                    --target={cross_abi}"
-            """).format(**varmap))
-
-        if cross_arch and package_format == "rpm":
+        if cross_arch:
             sys.stdout.write(textwrap.dedent("""
                 ENV ABI "{cross_abi}"
                 ENV CONFIGURE_OPTS "--host={cross_abi} \\
-- 
2.24.1




More information about the libvir-list mailing list