Merge pull request #830 from h0tw1r3/consistent-selinux-support

Author: joshcooper

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 !~ /ppc64el$/)
+  proj.component 'ruby-selinux'
+end
 
 # Additional Rubies
 if proj.respond_to?(:additional_rubies)

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 !~ /ppc64el$/)
+  proj.component 'ruby-selinux'
 end
 
 # libedit is used instead of readline on these platforms

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 !~ /ppc64el$/)
     proj.component 'ruby-selinux'
   end