From 2354911baaf2f8a897942d1d859b544884372a07 Mon Sep 17 00:00:00 2001 From: Sej Date: Mon, 7 Dec 2020 18:38:44 +0000 Subject: [PATCH 1/2] move CRB packages out of common build tool list Signed-off-by: Sej --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml index 77212a2a36..f726107972 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml @@ -24,9 +24,7 @@ Build_Tool_Packages: - glibc-devel - gmp-devel - libcurl-devel - - libdwarf-devel # OpenJ9 - libffi-devel - - libmpc-devel - libpng-devel - libXext-devel - libXi-devel # JDK12+ compilation @@ -47,6 +45,8 @@ Build_Tool_Packages: - zip Additional_Build_Tools_NOT_RHEL8: + - libdwarf-devel # now in CodeReady Linux Builder (CRB) repo + - libmpc-devel # now in CodeReady Linux Builder (CRB) repo - ntp # in RHEL8, ntp package is replaced by chrony Additional_Build_Tools_RHEL8: From b0b395d3cd574905398c48d7f9c42664b03a312a Mon Sep 17 00:00:00 2001 From: Sej Date: Wed, 9 Dec 2020 18:35:42 +0000 Subject: [PATCH 2/2] remove extra libdwarf-devel from common build tool list Signed-off-by: Sej --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 5f9cad5343..86cfff24f5 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml @@ -26,7 +26,6 @@ Build_Tool_Packages: - gmp-devel - java-1.8.0-openjdk-devel - libcurl-devel - - libdwarf-devel # OpenJ9 - libpng-devel - libXext-devel - libXi-devel # JDK12+ compilation @@ -67,7 +66,7 @@ Additional_Build_Tools_CentOS8: - glibc-langpack-zh # required for creating Chinese locales Additional_Build_Tools_NOT_CentOS8: - - libdwarf-devel + - libdwarf-devel # OpenJ9. Now in PowerTools repo. - lbzip2 - java-1.7.0-openjdk-devel - ntp