From 01b06fbea65a5273b6f938142184a7383abda82f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 18 Jul 2022 16:18:36 -0400 Subject: [PATCH] ansible: Add Ubuntu 22.04 support to binutils-gdb role Change-Id: Ieb56779e5769f59d9b3455946904dc468e0a39d0 Signed-off-by: Michael Jeanson --- .../ansible/roles/binutils-gdb/tasks/main.yml | 13 ++++++------- .../ansible/roles/binutils-gdb/vars/Alpine.yml | 2 +- .../ansible/roles/binutils-gdb/vars/Debian.yml | 8 ++++---- .../ansible/roles/binutils-gdb/vars/RedHat.yml | 2 +- automation/ansible/roles/binutils-gdb/vars/Suse.yml | 2 +- .../ansible/roles/binutils-gdb/vars/Ubuntu-22.yml | 8 ++++++++ 6 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 automation/ansible/roles/binutils-gdb/vars/Ubuntu-22.yml diff --git a/automation/ansible/roles/binutils-gdb/tasks/main.yml b/automation/ansible/roles/binutils-gdb/tasks/main.yml index 733840c..cd37dff 100644 --- a/automation/ansible/roles/binutils-gdb/tasks/main.yml +++ b/automation/ansible/roles/binutils-gdb/tasks/main.yml @@ -1,16 +1,15 @@ --- # Include variables and define needed variables. - name: Include OS-specific variables. - include_vars: "{{ ansible_os_family }}.yml" - -- name: Define binutils_gdb_packages. - set_fact: - binutils_gdb_packages: "{{ __binutils_gdb_packages | list }}" - when: binutils_gdb_packages is not defined + include_vars: "{{ item }}" + with_first_found: + - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" # Setup/install tasks. - include: setup-RedHat.yml - when: ansible_os_family == 'RedHat' + when: ansible_os_family in ['RedHat', 'Rocky'] - include: setup-Debian.yml when: ansible_os_family == 'Debian' diff --git a/automation/ansible/roles/binutils-gdb/vars/Alpine.yml b/automation/ansible/roles/binutils-gdb/vars/Alpine.yml index ec18d42..3edd142 100644 --- a/automation/ansible/roles/binutils-gdb/vars/Alpine.yml +++ b/automation/ansible/roles/binutils-gdb/vars/Alpine.yml @@ -1,3 +1,3 @@ --- -__binutils_gdb_packages: +binutils_gdb_packages: - libgmp-dev diff --git a/automation/ansible/roles/binutils-gdb/vars/Debian.yml b/automation/ansible/roles/binutils-gdb/vars/Debian.yml index d86c185..4b0e702 100644 --- a/automation/ansible/roles/binutils-gdb/vars/Debian.yml +++ b/automation/ansible/roles/binutils-gdb/vars/Debian.yml @@ -1,8 +1,8 @@ --- -__binutils_gdb_packages: - - libgmp-dev - - guile-2.2-dev +binutils_gdb_packages: - dejagnu + - gfortran - gnat + - guile-2.2-dev + - libgmp-dev - libreadline-dev - - gfortran diff --git a/automation/ansible/roles/binutils-gdb/vars/RedHat.yml b/automation/ansible/roles/binutils-gdb/vars/RedHat.yml index d4e53ab..43ae5e7 100644 --- a/automation/ansible/roles/binutils-gdb/vars/RedHat.yml +++ b/automation/ansible/roles/binutils-gdb/vars/RedHat.yml @@ -1,3 +1,3 @@ --- -__binutils_gdb_packages: +binutils_gdb_packages: - gmp-devel diff --git a/automation/ansible/roles/binutils-gdb/vars/Suse.yml b/automation/ansible/roles/binutils-gdb/vars/Suse.yml index d4e53ab..43ae5e7 100644 --- a/automation/ansible/roles/binutils-gdb/vars/Suse.yml +++ b/automation/ansible/roles/binutils-gdb/vars/Suse.yml @@ -1,3 +1,3 @@ --- -__binutils_gdb_packages: +binutils_gdb_packages: - gmp-devel diff --git a/automation/ansible/roles/binutils-gdb/vars/Ubuntu-22.yml b/automation/ansible/roles/binutils-gdb/vars/Ubuntu-22.yml new file mode 100644 index 0000000..940303a --- /dev/null +++ b/automation/ansible/roles/binutils-gdb/vars/Ubuntu-22.yml @@ -0,0 +1,8 @@ +--- +binutils_gdb_packages: + - dejagnu + - gfortran + - gnat-11 + - guile-2.2-dev + - libgmp-dev + - libreadline-dev -- 2.34.1