From 5813f004b1131825716586ec647ad9690f2db76d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 26 Apr 2024 16:51:34 -0400 Subject: [PATCH] ansible: fix cross compilers role on armhf/arm64 Change-Id: I9d6ffd581fc1acf21e31cb7386b53c5fd7685eae Signed-off-by: Michael Jeanson --- .../cross-compilers/tasks/setup-Debian.yml | 2 +- .../roles/cross-compilers/vars/Debian.yml | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml index 7464b1e..95173f2 100644 --- a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml +++ b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml @@ -17,7 +17,7 @@ - name: Ensure cross-compilers packages are installed. ansible.builtin.apt: - name: "{{ cross_compilers_packages | difference(lookup('vars', 'cross_compilers_packages_exclude_{{ansible_userspace_architecture}}', default=[]))}}" + name: "{{ cross_compilers_packages | difference(lookup('vars', 'cross_compilers_packages_exclude_{{ansible_userspace_architecture|default(ansible_architecture)}}', default=[]))}}" - name: Install legacy cross compilers when: ansible_distribution == 'Debian' and ansible_architecture == 'x86_64' and compilers_legacy_install diff --git a/automation/ansible/roles/cross-compilers/vars/Debian.yml b/automation/ansible/roles/cross-compilers/vars/Debian.yml index 45e8723..d27e26e 100644 --- a/automation/ansible/roles/cross-compilers/vars/Debian.yml +++ b/automation/ansible/roles/cross-compilers/vars/Debian.yml @@ -32,4 +32,44 @@ cross_compilers_packages_exclude_i386: - gcc-12-i686-linux-gnu - gcc-11-i686-linux-gnu +# Packages not available on aarch64 +cross_compilers_packages_exclude_aarch64: + - gcc-aarch64-linux-gnu + - gcc-12-aarch64-linux-gnu + - gcc-11-aarch64-linux-gnu + - gcc-powerpc-linux-gnu + - gcc-12-powerpc-linux-gnu + - gcc-11-powerpc-linux-gnu + +# Packages not available on armhf +# Yeah, that's all of them... +cross_compilers_packages_exclude_armv7l: + - gcc-aarch64-linux-gnu + - gcc-arm-linux-gnueabihf + - gcc-i686-linux-gnu + - gcc-powerpc64le-linux-gnu + - gcc-powerpc-linux-gnu + - gcc-riscv64-linux-gnu + - gcc-s390x-linux-gnu + - gcc-12-aarch64-linux-gnu + - gcc-12-arm-linux-gnueabihf + - gcc-12-i686-linux-gnu + - gcc-12-powerpc64le-linux-gnu + - gcc-12-powerpc-linux-gnu + - gcc-12-riscv64-linux-gnu + - gcc-12-s390x-linux-gnu + - gcc-11-aarch64-linux-gnu + - gcc-11-arm-linux-gnueabihf + - gcc-11-i686-linux-gnu + - gcc-11-powerpc64le-linux-gnu + - gcc-11-s390x-linux-gnu + - gcc-11-powerpc-linux-gnu + - gcc-11-riscv64-linux-gnu + - gcc-aarch64-linux-gnu + - gcc-12-aarch64-linux-gnu + - gcc-11-aarch64-linux-gnu + - gcc-riscv64-linux-gnu + - gcc-12-riscv64-linux-gnu + - gcc-11-riscv64-linux-gnu + cross_compilers_debian_bookworm_snapshot: true -- 2.34.1