Merge pull request #863 from joshcooper/minitar-aix

Add minitar rubygem on AIX
puppetlabs · Jul 3, 2024 · 08c0261 · 08c0261
2 parents a39b23b + 9408177
commit 08c0261
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb
@@ -60,10 +60,10 @@
 proj.component 'rubygem-locale'
 proj.component 'rubygem-gettext'
 proj.component 'rubygem-fast_gettext'
+proj.component 'rubygem-ffi'
 
-if platform.is_windows? || platform.is_solaris?
+if platform.is_windows? || platform.is_solaris? || platform.is_aix?
   proj.component 'rubygem-minitar'
-  proj.component 'rubygem-ffi'
 end
 
 if platform.is_macos?

diff --git a/configs/projects/agent-runtime-7.x.rb b/configs/projects/agent-runtime-7.x.rb
@@ -54,7 +54,6 @@
   # When adding components to this list, please
   # add them to pe-installer-runtime-main as well
   proj.component 'rubygem-concurrent-ruby'
-  proj.component 'rubygem-ffi'
   proj.component 'rubygem-multi_json'
   proj.component 'rubygem-optimist'
   proj.component 'rubygem-highline'

diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
@@ -56,7 +56,6 @@
   # When adding components to this list, please
   # add them to pe-installer-runtime-main as well
   proj.component 'rubygem-concurrent-ruby'
-  proj.component 'rubygem-ffi'
   proj.component 'rubygem-multi_json'
   proj.component 'rubygem-optimist'
   proj.component 'rubygem-highline'