From 2cf78f2787266ece0b21e023dcfc3963cb0c7366 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 17 Apr 2024 15:28:49 -0500 Subject: [PATCH] ensure ruby-selinux component is included consistently across runtimes --- configs/projects/_pdk-components.rb | 5 ++++- configs/projects/_shared-agent-components.rb | 6 ++---- configs/projects/bolt-runtime.rb | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configs/projects/_pdk-components.rb b/configs/projects/_pdk-components.rb index 957634020..4e0992d54 100644 --- a/configs/projects/_pdk-components.rb +++ b/configs/projects/_pdk-components.rb @@ -26,7 +26,10 @@ proj.component "ruby-#{proj.ruby_version}" proj.component 'ruby-augeas' unless platform.is_windows? -proj.component 'ruby-selinux' if platform.is_el? || platform.is_fedora? +# We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386) +if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/) + proj.component 'ruby-selinux' +end # Additional Rubies if proj.respond_to?(:additional_rubies) diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb index 2a03db874..29afb5f55 100644 --- a/configs/projects/_shared-agent-components.rb +++ b/configs/projects/_shared-agent-components.rb @@ -41,10 +41,8 @@ proj.component 'ruby-augeas' unless platform.is_windows? proj.component 'ruby-shadow' unless platform.is_aix? || platform.is_windows? # We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386) -if platform.is_el? || platform.is_fedora? || platform.name =~ /debian|ubuntu/ - if platform.name !~ /ubuntu-.*-ppc64el/ - proj.component 'ruby-selinux' - end +if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/) + proj.component 'ruby-selinux' end # libedit is used instead of readline on these platforms diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index 225117c2a..13b42fb72 100644 --- a/configs/projects/bolt-runtime.rb +++ b/configs/projects/bolt-runtime.rb @@ -222,8 +222,8 @@ proj.component 'rubygem-winrm-fs' # Components from puppet-runtime included to support apply on localhost - # Only bundle SELinux gem for RHEL,Centos,Fedora - if platform.is_el? || platform.is_fedora? + # We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386) + if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/) proj.component 'ruby-selinux' end