From 2bf767c2ec4f658d6fe9d595e6a8026fd2efdbf4 Mon Sep 17 00:00:00 2001 From: vsebe Date: Tue, 15 Aug 2023 11:29:24 -0400 Subject: [PATCH] unixPb: Fix libdwarf installation on CentOS 8 non-x64 (#3040) Use dnf config-manager to enable powertools repo. Fix libdwarf package name. Signed-off-by: Violeta Sebe --- .../roles/Common/tasks/CentOS.yml | 6 +----- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml index 401bfad1df..a7b49edfd3 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -30,11 +30,7 @@ tags: patch_update - name: Enable CentOS-PowerTools repo for CentOS8 - replace: - path: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo - regexp: 'enabled=0' - replace: "enabled=1" - failed_when: false + shell: dnf config-manager --set-enabled powertools when: - ansible_distribution_major_version == "8" tags: patch_update diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml index 6446700caf..41f46b70f0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml @@ -85,7 +85,7 @@ Additional_Build_Tools_CentOS_x86: - libstdc++.i686 # a dependency required for executing a 32-bit C binary Additional_Build_Tools_CentOS8_Stream: - - libdwarf.x86_64 + - libdwarf - libmpc-devel Additional_Build_Tools_NOT_CentOS8_Stream: