Skip to content

Commit 531fb1f

Browse files
authored
Merge pull request #800 from h0tw1r3/pa-6025
(PA-6025) add ubuntu 24.04 amd64 platform
2 parents 0406beb + d604d5a commit 531fb1f

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
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
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

0 commit comments

Comments
 (0)