Skip to content

Commit 5730f2f

Browse files
authored
Merge pull request #46 from genebean/ubuntu2504
Add Ubuntu 25.04
2 parents 30b5748 + 7bd9fa6 commit 5730f2f

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

configs/components/_base-ruby-selinux.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
pkg.sha256sum '9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19'
4747
pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz"
4848
pkg.build_requires 'python3-setuptools'
49-
elsif platform.name.start_with?('el-10')
49+
elsif platform.name =~ /el-10|ubuntu-25.04/
5050
# SELinux 3.7 is the minimum version available in RHEL 10 repos
5151
pkg.version '3.7'
5252
pkg.sha256sum 'ea03f42d13a4f95757997dba8cf0b26321fac5d2f164418b4cc856a92d2b17bd'

configs/components/ruby-3.2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
special_flags = " --prefix=#{ruby_dir} --with-opt-dir=#{settings[:prefix]} "
8080

8181
cflags = settings[:cflags]
82-
if platform.is_debian? && platform.os_version.to_i >= 13
82+
if (platform.is_debian? && platform.os_version.to_i >= 13) || (platform.is_ubuntu? && platform.os_version =~ /25.04/)
8383
# A problem with --enable-dtrace, which I suspect may be because of GCC on the Trixie image.
8484
# Check if this is still needed next time we bump Ruby and/or bump the Debian 13
8585
# container to the release version.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
platform "ubuntu-25.04-aarch64" 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+
end
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
platform "ubuntu-25.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+
end

0 commit comments

Comments
 (0)