Skip to content

(PA-6025) add ubuntu 24.04 amd64 platform #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshcooper merged 1 commit into from
Mar 8, 2024
Merged

(PA-6025) add ubuntu 24.04 amd64 platform #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion configs/components/_base-ruby-selinux.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
pkg.sha256sum '77c294a927e6795c2e98f74b5c3adde9c8839690e9255b767c5fca6acff9b779'
pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz"
pkg.build_requires 'python3-distutils'
elsif platform.name.start_with?('ubuntu-24')
# SELinux 3.5 is the minimum version available in Ubuntu 24 repos
pkg.version '3.5'
pkg.sha256sum '9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19'
pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz"
pkg.build_requires 'python3-setuptools'
else
pkg.version "2.9"
pkg.md5sum "bb449431b6ed55a0a0496dbc366d6e31"
Expand Down Expand Up @@ -72,7 +78,7 @@

if ruby_version =~ /^3/
# swig 4.1 generated interface does not need patching
unless platform.name =~ /debian-12/
unless platform.name =~ /^(debian-12|ubuntu-24)/
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch"
end
end
Expand Down
15 changes: 15 additions & 0 deletions configs/platforms/ubuntu-24.04-amd64.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
platform "ubuntu-24.04-amd64" do |plat|
plat.inherit_from_default

packages = %w(
libbz2-dev
libreadline-dev
libselinux1-dev
gcc
swig
systemtap-sdt-dev
zlib1g-dev
)
plat.provision_with "export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install -qy --no-install-recommends #{packages.join(' ')}"
plat.provision_with "curl https://artifactory.delivery.puppetlabs.net/artifactory/api/gpg/key/public | apt-key add -"
end