From 33eec3ed57b3734e49c239f56aeb82ee808b6c87 Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Mon, 3 Apr 2023 13:52:58 -0400 Subject: [PATCH] unixPB: Add perl-IPC-Cmd to Redhat/CentOS installs for OpenSSL v3 compile * compiling openssl v3 within container or system requires this package * see https://github.com/eclipse-openj9/openj9/pull/14930 These were added in https://github.com/adoptium/infrastructure/pull/2855 but in the wrong place. perl-IPC-Cmd is required for all platforms. Signed-off-by: Peter Shipton --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml | 2 +- .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml | 2 +- 2 files changed, 2 insertions(+), 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 e88ec0cea3..6446700caf 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml @@ -45,6 +45,7 @@ Build_Tool_Packages: - perl-devel - perl-Digest-SHA - perl-GD + - perl-IPC-Cmd # required for openssl v3 compiles - perl-libwww-perl - perl-Time-HiRes - pigz @@ -82,7 +83,6 @@ Additional_Build_Tools_CentOS_x86: - glibc.i686 # a dependency required for executing a 32-bit C binary - glibc-devel.i686 # a dependency required for executing a 32-bit C binary - libstdc++.i686 # a dependency required for executing a 32-bit C binary - - perl-IPC-Cmd # required for openssl v3 compiles Additional_Build_Tools_CentOS8_Stream: - libdwarf.x86_64 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 5fdc872437..b2889e9583 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml @@ -41,6 +41,7 @@ Build_Tool_Packages: - mpfr-devel - openssl-devel - perl-devel + - perl-IPC-Cmd # required for openssl v3 compiles - pkgconfig - systemtap-sdt-devel - unzip @@ -71,7 +72,6 @@ Additional_Build_Tools_RHEL_x86: - glibc.i686 # a dependency required for executing a 32-bit C binary - glibc-devel.i686 # a dependency required for executing a 32-bit C binary - libstdc++.i686 # a dependency required for executing a 32-bit C binary - - perl-IPC-Cmd # required for openssl v3 compiles Additional_Build_Tools_RHEL_ppc64: - glibc.ppc # a dependency required for executing a 32-bit C binary