From 4c1216134c30f8e7a04e5958d5870223b4adf58d Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 21 Sep 2023 09:19:12 +0200 Subject: [PATCH] ci: use Debian ARM hard-float port instead of armel Newer ARMv7 boards are actually supported by armhf, not armel. armel containers might not even work: The following packages have unmet dependencies: libc6-dev:armel : Depends: linux-libc-dev:armel but it is not installable E: Unable to correct problems, you have held broken packages. Signed-off-by: Krzysztof Kozlowski [DB: fixed pkg-config-path] Signed-off-by: Dmitry Baryshkov --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e1ca4d..0eede7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,11 +76,11 @@ jobs: # Debian cross compilation builds - container: "debian:testing" - arch: armel - compiler: arm-linux-gnueabi-gcc - cross_compile: arm-linux-gnueabi + arch: armhf + compiler: arm-linux-gnueabihf-gcc + cross_compile: arm-linux-gnueabihf variant: cross-compile - pkg_config_path: /usr/lib/arm-linux-gnueabi/pkgconfig + pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig - container: "debian:testing" arch: arm64 @@ -104,11 +104,11 @@ jobs: pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig - container: "debian:stable" - arch: armel - compiler: arm-linux-gnueabi-gcc - cross_compile: arm-linux-gnueabi + arch: armhf + compiler: arm-linux-gnueabihf-gcc + cross_compile: arm-linux-gnueabihf variant: cross-compile - pkg_config_path: /usr/lib/arm-linux-gnueabi/pkgconfig + pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig - container: "debian:stable" arch: arm64