(PE-37599) Build client-tools-runtime-2021.7.x project for Red Hat 9 …

…FIPS (Intel)
puppetlabs · Mar 18, 2024 · 81b955a · 81b955a
1 parent 0ec2d4e
commit 81b955a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/configs/components/curl.rb b/configs/components/curl.rb
@@ -4,7 +4,7 @@
   pkg.url "https://curl.se/download/curl-#{pkg.get_version}.tar.gz"
   pkg.mirror "#{settings[:buildsources_url]}/curl-#{pkg.get_version}.tar.gz"
 
-  pkg.build_requires "openssl-#{settings[:openssl_version]}"
+  # pkg.build_requires "openssl-#{settings[:openssl_version]}"
   pkg.build_requires "puppet-ca-bundle"
 
   ldflags = settings[:ldflags]

diff --git a/configs/components/puppet-ca-bundle.rb b/configs/components/puppet-ca-bundle.rb
@@ -1,7 +1,7 @@
 component "puppet-ca-bundle" do |pkg, settings, platform|
   pkg.load_from_json("configs/components/puppet-ca-bundle.json")
 
-  pkg.build_requires "openssl-#{settings[:openssl_version]}"
+  # pkg.build_requires "openssl-#{settings[:openssl_version]}"
 
   if platform.is_cross_compiled_linux?
     # Use the build host's openssl command, not our cross-compiled or vendored one

diff --git a/configs/projects/_shared-client-tools-runtime.rb b/configs/projects/_shared-client-tools-runtime.rb
@@ -25,7 +25,7 @@
 # and krb5-devel
 if proj.settings[:openssl_version]
   # already defined in the project
-elsif platform.name =~ /^redhatfips-8/
+elsif platform.name =~ /^redhatfips-[89]/
   proj.setting(:openssl_version, '1.1.1k')
 else
   proj.setting(:openssl_version, '1.1.1')
@@ -109,7 +109,7 @@
 
 if platform.name =~ /^redhatfips-7/ && proj.openssl_version == '1.1.1'
   proj.component "openssl-1.1.1-fips"
-elsif platform.name =~ /^redhatfips-8/ && proj.openssl_version == '1.1.1k'
+elsif platform.name =~ /^redhatfips-[89]/ && proj.openssl_version == '1.1.1k'
   proj.component "openssl-1.1.1-fips"
 elsif proj.settings[:openssl_version]
   proj.component "openssl-#{proj.openssl_version}"