ansible: fix cross compilers role on armhf/arm64

Change-Id: I9d6ffd581fc1acf21e31cb7386b53c5fd7685eae
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
index 7464b1e7b18ccffa5f5ffeb980b730abc3781f5a..95173f243d5e72196c3d5e3a214d678507e8556d 100644 (file)
--- 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 45e8723d028fd349d97daf3f73345990f21aad9a..d27e26e665f2df2c3745f78154d6e1521deff828 100644 (file)
--- 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