ensure ruby-selinux component is included consistently across runtimes

puppetlabs · Apr 17, 2024 · 2cf78f2 · 2cf78f2
1 parent 436024a
commit 2cf78f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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