Skip to content

Commit 2cf78f2

Browse files
committed
ensure ruby-selinux component is included consistently across runtimes
1 parent 436024a commit 2cf78f2

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

configs/projects/_pdk-components.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
proj.component "ruby-#{proj.ruby_version}"
2727

2828
proj.component 'ruby-augeas' unless platform.is_windows?
29-
proj.component 'ruby-selinux' if platform.is_el? || platform.is_fedora?
29+
# We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386)
30+
if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/)
31+
proj.component 'ruby-selinux'
32+
end
3033

3134
# Additional Rubies
3235
if proj.respond_to?(:additional_rubies)

configs/projects/_shared-agent-components.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@
4141
proj.component 'ruby-augeas' unless platform.is_windows?
4242
proj.component 'ruby-shadow' unless platform.is_aix? || platform.is_windows?
4343
# We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386)
44-
if platform.is_el? || platform.is_fedora? || platform.name =~ /debian|ubuntu/
45-
if platform.name !~ /ubuntu-.*-ppc64el/
46-
proj.component 'ruby-selinux'
47-
end
44+
if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/)
45+
proj.component 'ruby-selinux'
4846
end
4947

5048
# libedit is used instead of readline on these platforms

configs/projects/bolt-runtime.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@
222222
proj.component 'rubygem-winrm-fs'
223223

224224
# Components from puppet-runtime included to support apply on localhost
225-
# Only bundle SELinux gem for RHEL,Centos,Fedora
226-
if platform.is_el? || platform.is_fedora?
225+
# We only build ruby-selinux for EL, Fedora, Debian and Ubuntu (amd64/i386)
226+
if platform.is_el? || platform.is_fedora? || platform.is_debian? || (platform.is_ubuntu? && platform.architecture !~ /ppc64le$/)
227227
proj.component 'ruby-selinux'
228228
end
229229

0 commit comments

Comments
 (0)