Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

ensure ruby-selinux component is included consistently across runtimes #830

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion configs/projects/_pdk-components.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 !~ /ppc64el$/)
proj.component 'ruby-selinux'
end

# Additional Rubies
if proj.respond_to?(:additional_rubies)
Expand Down
6 changes: 2 additions & 4 deletions configs/projects/_shared-agent-components.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 !~ /ppc64el$/)
proj.component 'ruby-selinux'
end

# libedit is used instead of readline on these platforms
Expand Down
4 changes: 2 additions & 2 deletions configs/projects/bolt-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 !~ /ppc64el$/)
proj.component 'ruby-selinux'
end

Expand Down
Loading