Skip to content

Commit

Permalink
Merge pull request #352 from puppetlabs/CAT-1744/main/fedora-36
Browse files Browse the repository at this point in the history
(CAT-1744) Set Fedora 36 image to use the default settings
  • Loading branch information
jordanbreen28 authored Mar 11, 2024
2 parents ab2fa24 + 18011a7 commit 69c9b44
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions configs/platforms/fedora-36-x86_64.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
platform 'fedora-36-x86_64' do |plat|
plat.servicedir '/usr/lib/systemd/system'
plat.defaultdir '/etc/sysconfig'
plat.servicetype 'systemd'
plat.dist 'fc36' # There's an issue with the version of binutils (2.37) in Fedora 36's repos

# We temporarily use a newer version from rawhide. See PA-4448
plat.provision_with('/usr/bin/dnf install -y fedora-repos-rawhide')
plat.provision_with('/usr/bin/dnf install -y --enablerepo rawhide binutils')

packages = %w[
autoconf automake bzip2-devel gcc gcc-c++ libselinux-devel
libsepol libsepol-devel make cmake pkgconfig readline-devel
rpmdevtools rsync swig zlib-devel systemtap-sdt-devel
perl-lib perl-FindBin
]
plat.provision_with("/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}")

plat.install_build_dependencies_with '/usr/bin/dnf install -y --best --allowerasing'
plat.inherit_from_default
end

0 comments on commit 69c9b44

Please sign in to comment.