From 08f0feb9c6a2cab9b8281d0a6f5358d87a1a6500 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 17 Jun 2024 19:11:08 -0700 Subject: [PATCH 1/2] Remove redundant rubygem-ffi The rubygem-ffi component was added in the agent-runtime- project for all platforms and in the _shared-agent-components on Windows, etc. Just add it always in the _shared-agent-components, which is also included by _shared-pe-installer-runtime. $ git grep rubygem-ffi configs/projects/ configs/projects/_pdk-components.rb:proj.component 'rubygem-ffi' configs/projects/_shared-agent-components.rb:proj.component 'rubygem-ffi' configs/projects/_shared-pe-bolt-server.rb:proj.component('rubygem-ffi') configs/projects/_shared-pe-bolt-server_with_ruby.rb:proj.component('rubygem-ffi') configs/projects/_shared-pe-installer-runtime.rb:proj.component('rubygem-ffi') configs/projects/bolt-runtime.rb: proj.component 'rubygem-ffi' The only project that doesn't add the ffi rubygem is client-tools-runtime-* --- configs/projects/_shared-agent-components.rb | 2 +- configs/projects/agent-runtime-7.x.rb | 1 - configs/projects/agent-runtime-main.rb | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb index d5d224739..29d296932 100644 --- 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? 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 index 0ffb1c1f9..93f45363a 100644 --- 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 index bf08e684e..e7bdce75a 100644 --- 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' From 940817797209248ef3d212ae4e33523554435013 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 17 Jun 2024 19:09:24 -0700 Subject: [PATCH 2/2] Add minitar gem on AIX The puppet module install command assumes tar is GNUtar, which doesn't work on AIX. Install minitar on AIX like we do for Windows and Solaris. --- configs/projects/_shared-agent-components.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/projects/_shared-agent-components.rb b/configs/projects/_shared-agent-components.rb index 29d296932..6e722cc46 100644 --- a/configs/projects/_shared-agent-components.rb +++ b/configs/projects/_shared-agent-components.rb @@ -62,7 +62,7 @@ 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' end