From: David Heidelberg <david.heidelberg@collabora.com>
Date: Fri, 18 Nov 2022 22:54:31 +0000 (+0100)
Subject: ci/cross: switch from the debcrossgen to the meson env2mfile
X-Git-Tag: upstream/23.3.3~16101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f94c369603a6f61b9806939f425f1f644fa6440;p=platform%2Fupstream%2Fmesa.git

ci/cross: switch from the debcrossgen to the meson env2mfile

Modern Debian recommends to use `meson env2mfile` rather than `debcrossgen`:
```
WARNING: this tool is deprecated, use "meson env2mfile" instead.
```

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7740

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19863>
---

diff --git a/.gitlab-ci/container/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh
index abfe72f..1db9aa7 100755
--- a/.gitlab-ci/container/create-cross-file.sh
+++ b/.gitlab-ci/container/create-cross-file.sh
@@ -2,13 +2,11 @@
 
 arch=$1
 cross_file="/cross_file-$arch.txt"
-/usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
+meson env2mfile --cross --debarch "$arch" -o "$cross_file"
+
 # Explicitly set ccache path for cross compilers
 sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
-if [ "$arch" = "i386" ]; then
-    # Work around a bug in debcrossgen that should be fixed in the next release
-    sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"
-fi
+
 # Rely on qemu-user being configured in binfmt_misc on the host
 # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
 sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
@@ -29,6 +27,7 @@ elif [[ "$arch" = "s390x" ]]; then
 else
     echo "Needs rustc target mapping"
 fi
+
 # shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
 sed -i -e '/\[binaries\]/a\' -e "rust = ['rustc', '--target=$rust_target', '-C', 'linker=$cc']" "$cross_file"
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 8c339ee..e3e8976 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,6 +1,6 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-11-22-arm-test-split-1"
+   DEBIAN_BASE_TAG: "2022-11-26-use-meson-env2mfile"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
    DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3"