Skip to content

unixPB: Updates for Centos Stream 10 #4060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

unixPB: Updates for Centos Stream 10 #4060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8c9b5
unixPB: Change conditional for SCL OS versions
sxa Sep 12, 2025
b453060
unixPB: Additional changes to allow use on CS10
sxa Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@

- name: Install additional build tools when NOT CentOS8+
package: "name={{ item }} state=latest"
with_items: "{{ Additional_Build_Tools_NOT_CentOS8_CentOS9Stream }}"
with_items: "{{ Additional_Build_Tools_NOT_CentOS8plus }}"
when:
- ansible_distribution_major_version|int < 8
- ansible_distribution_major_version | int < 8
tags: build_tools

- name: Install additional test tools for CentOS 10+ e.g. weston
Expand Down Expand Up @@ -157,8 +157,7 @@
package: "name=centos-release-scl state=latest"
when:
- ansible_architecture == "x86_64"
- ansible_distribution_major_version != "8"
- ansible_distribution_major_version != "9"
- ansible_distribution_major_version | int < 8
tags: build_tools

- name: Sed change the baseurl for CentOS SCL (CentOS6)
Expand Down Expand Up @@ -208,11 +207,12 @@
- ansible_architecture == "x86_64" and ansible_distribution_major_version == "7"
tags: build_tools

- name: Install additional build tools for CentOS on x86
- name: Install additional build tools for CentOS on x86 for EL<10 (Not 32-bit support)
package: "name={{ item }} state=latest"
with_items: "{{ Additional_Build_Tools_CentOS_x86 }}"
when:
- ansible_architecture == "x86_64"
- ansible_distribution_major_version | int < 10
tags: build_tools

- name: Create symlink for /opt/rh/devtoolset-2/root/usr/bin/gcc to gcc
Expand Down
2 changes: 1 addition & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Additional_Build_Tools_CentOS8_Plus:
- ccache
- procps-ng

Additional_Build_Tools_NOT_CentOS8_CentOS9Stream:
Additional_Build_Tools_NOT_CentOS8plus:
- lbzip2
- java-1.7.0-openjdk-devel
- java-1.8.0-openjdk-devel
Expand Down
3 changes: 2 additions & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,15 @@
- (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')))
tags: nasm

- name: Running ./configure & make for nasm ( Not Ubuntu 22+ and not Fedora 35+ )
- name: Running ./configure & make for nasm ( Not Ubuntu 22+ and not Fedora 35+ based distros )
shell: cd /tmp/nasm-{{ nasm_version }} && CC={{ CC }} && ./configure -prefix=/usr/local && make install
environment:
CC: "{{ CC }}"
when:
- (ansible_distribution != "Ubuntu") or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int < 22)
- (ansible_distribution != "Fedora") or (ansible_distribution == "Fedora" and ansible_distribution_major_version | int < 35)
- (ansible_distribution != "RedHat") or (ansible_distribution == "RedHat" and ansible_distribution_major_version | int < 10)
- (ansible_distribution != "CentOS") or (ansible_distribution == "CentOS" and ansible_distribution_major_version | int < 10)
- nasm_installed.rc is defined
- (nasm_installed.rc != 0 or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')))
tags: nasm
Expand Down
Loading