From 80b7787babb1e686fad41cfbaf105bcb85f73070 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Wed, 24 May 2023 12:18:23 +0200 Subject: [PATCH] ci: install stock android-libext4-utils (available in 12, bookworm) Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/debian/arm_build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh index 8b33f48ce11..a96fca9447d 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -18,6 +18,7 @@ STABLE_EPHEMERAL=" \ apt-get -y install \ ${EXTRA_LOCAL_PACKAGES} \ ${STABLE_EPHEMERAL} \ + android-libext4-utils \ autoconf \ automake \ bc \ @@ -65,10 +66,6 @@ apt-get -y install \ zlib1g-dev \ zstd -# Not available anymore in bullseye -apt-get install -y --no-remove -t buster \ - android-sdk-ext4-utils - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # We need at least 0.61.4 for proper Rust; 0.62 for modern meson env2mfile