Skip to content

Commit 5df6094

Browse files
authored
Merge pull request #491 from GabrielNagy/PA-3769/redhat-8-fips
(PA-3769) Add RedHat 8 FIPS platform
2 parents 3b42ab7 + 11832da commit 5df6094

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
platform "redhatfips-8-x86_64" do |plat|
2+
# Uncomment the following line when a vanagon with defaults for this platform is released
3+
# plat.inherit_from_default
4+
5+
# Delete everything below when a vanagon with defaults for this platform is released
6+
plat.servicedir "/usr/lib/systemd/system"
7+
plat.defaultdir "/etc/sysconfig"
8+
plat.servicetype "systemd"
9+
10+
packages = %w(
11+
cmake
12+
gcc-c++
13+
java-1.8.0-openjdk-devel
14+
libarchive
15+
libsepol-devel
16+
libselinux-devel
17+
openssl-devel
18+
pkgconfig
19+
readline-devel
20+
rpm-build
21+
rpmdevtools
22+
rsync
23+
swig
24+
systemtap-sdt-devel
25+
yum-utils
26+
zlib-devel
27+
)
28+
plat.provision_with("dnf install -y --allowerasing #{packages.join(' ')}")
29+
plat.install_build_dependencies_with "yum install --assumeyes"
30+
plat.vmpooler_template "redhat-fips-8-x86_64"
31+
end

tasks/vanagon_component_diff.rake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ namespace :vanagon do |args|
271271
puts "Platform name:".h(3) + platform.cyan.code
272272
ordered_diff = diff.each_with_object({}) do |k, v|
273273
name, field = k[1].match(/^([a-zA-Z\-._0-9]+)\|?(.*)?/).captures
274+
next if ['_settings', '_platform'].include?(name)
274275
if field.nil? || field.empty?
275276
case k.first
276277
when '+'

0 commit comments

Comments
 (0)