From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 16 Jul 2020 08:26:02 +0000 (+0200)
Subject: meson: .gitlab-ci.yml: switch armv7l build to Debian 10
X-Git-Tag: v6.7.0-rc1~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=644d9ddb1a0f0697ddfd39ad02623b3ff779dfb1;p=thirdparty%2Flibvirt.git

meson: .gitlab-ci.yml: switch armv7l build to Debian 10

On Debian Sid there are broken headers for cross compilation. There is
no <asm/kvm.h> header unconditionally included by <linux/kvm.h>.

With autotools the build works correctly because the header detection
tries to compile simple code that includes the header but with Meson
the detection works differently. We check <linux/kvm.h> which is present
so it should be safe to include it.

We could workaround it in libvirt by checking for presence of
<asm/kvm.h> as well but I don't believe that's a correct approach.
IMHO it should be fixed in Debian.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05f51a83dd..7215367ef5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -384,6 +384,12 @@ armv6l-debian-10:
     NAME: debian-10
     CROSS: armv6l
 
+armv7l-debian-10:
+  <<: *cross_build_job_definition
+  variables:
+    NAME: debian-10
+    CROSS: armv7l
+
 mips64el-debian-10:
   <<: *cross_build_job_definition
   variables:
@@ -414,12 +420,6 @@ s390x-debian-sid:
     NAME: debian-sid
     CROSS: s390x
 
-armv7l-debian-sid:
-  <<: *cross_build_job_definition
-  variables:
-    NAME: debian-sid
-    CROSS: armv7l
-
 i686-debian-sid:
   <<: *cross_build_job_definition
   variables: