Mesa (master): ci: Autodetect whether we need cross setup in lava_arm builds.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a65521145c0da91a4fe4c9901921745a1af178f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a65521145c0da91a4fe4c9901921745a1af178f1

Author: Eric Anholt <eric at anholt.net>
Date:   Wed May 13 12:14:39 2020 -0700

ci: Autodetect whether we need cross setup in lava_arm builds.

The x86 baremetal build would have an armhf cross file, and need the
kernel env setup.

Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5033>

---

 .gitlab-ci.yml                   |  2 +-
 .gitlab-ci/container/lava_arm.sh | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 863d0ec9864..e5fe436bdb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ arm_build:
     - .fdo.container-build at debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-2"
 
 .use-arm_build:
   variables:
diff --git a/.gitlab-ci/container/lava_arm.sh b/.gitlab-ci/container/lava_arm.sh
index 124ed0792ff..15feb76f69a 100644
--- a/.gitlab-ci/container/lava_arm.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -17,10 +17,15 @@ else
     KERNEL_IMAGE_NAME="zImage"
 fi
 
-############### Build dEQP runner
-if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
-    EXTRA_MESON_ARGS="--cross-file /cross_file-armhf.txt"
+# Determine if we're in a cross build.
+if [[ -e /cross_file-$DEBIAN_ARCH.txt ]]; then
+    EXTRA_MESON_ARGS="--cross-file /cross_file-$DEBIAN_ARCH.txt"
+
+    export ARCH=${KERNEL_ARCH}
+    export CROSS_COMPILE="${GCC_ARCH}-"
 fi
+
+############### Build dEQP runner
 . .gitlab-ci/build-cts-runner.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
 mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
@@ -36,11 +41,6 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 ############### Cross-build kernel
 KERNEL_URL="https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.5-panfrost-fixes/linux-v5.5-panfrost-fixes.tar.gz"
 
-if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
-    export ARCH=${KERNEL_ARCH}
-    export CROSS_COMPILE="${GCC_ARCH}-"
-fi
-
 mkdir -p kernel
 wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C kernel
 pushd kernel