Skip to content

Commit 69667d0

Browse files
committed
(PA-6025) add ubuntu 24.04 amd64 platform
1 parent e0e631b commit 69667d0

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

configs/components/_base-ruby-selinux.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
pkg.sha256sum '77c294a927e6795c2e98f74b5c3adde9c8839690e9255b767c5fca6acff9b779'
2828
pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz"
2929
pkg.build_requires 'python3-distutils'
30+
elsif platform.name.start_with?('ubuntu-24')
31+
# SELinux 3.5 is the minimum version available in Ubuntu 24 repos
32+
pkg.version '3.5'
33+
pkg.sha256sum '9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19'
34+
pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz"
35+
pkg.build_requires 'python3-setuptools'
3036
else
3137
pkg.version "2.9"
3238
pkg.md5sum "bb449431b6ed55a0a0496dbc366d6e31"
@@ -72,7 +78,7 @@
7278

7379
if ruby_version =~ /^3/
7480
# swig 4.1 generated interface does not need patching
75-
unless platform.name =~ /debian-12/
81+
unless platform.name =~ /^(debian-12|ubuntu-24)/
7682
steps << "#{platform.patch} --strip=0 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../selinuxswig_ruby_wrap.patch"
7783
end
7884
end

configs/components/runtime-bolt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
pkg.install_file "#{settings[:tools_root]}/bin/libgdbm_compat-4.dll", "#{settings[:ruby_bindir]}/libgdbm_compat-4.dll"
1414
pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
1515
pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
16-
elsif platform.is_macos? or platform.name =~ /sles-15|el-8|debian-10|ubuntu-20.04|ubuntu-22.04/ || platform.is_fedora?
16+
elsif platform.is_macos? or platform.name =~ /sles-15|el-8|debian-10|ubuntu-2[024].04/ || platform.is_fedora?
1717

1818
# Do nothing for distros that have a suitable compiler do not use pl-build-tools
1919

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
platform "ubuntu-24.04-amd64" do |plat|
2+
plat.inherit_from_default
3+
4+
packages = %w(
5+
libbz2-dev
6+
libreadline-dev
7+
libselinux1-dev
8+
gcc
9+
swig
10+
systemtap-sdt-dev
11+
zlib1g-dev
12+
)
13+
plat.provision_with "export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install -qy --no-install-recommends #{packages.join(' ')}"
14+
plat.provision_with "curl https://artifactory.delivery.puppetlabs.net/artifactory/api/gpg/key/public | apt-key add -"
15+
end

configs/projects/bolt-runtime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230

231231
# Components from puppet-runtime included to support apply on localhost
232232
# Only bundle SELinux gem for RHEL,Centos,Fedora
233-
if platform.is_el? || platform.is_fedora?
233+
if platform.is_el? || platform.is_fedora? || platform.is_debian?
234234
proj.component 'ruby-selinux'
235235
end
236236

0 commit comments

Comments
 (0)