diff --git a/configs/components/ruby-3.2.rb b/configs/components/ruby-3.2.rb index afe46828..364ea4ed 100644 --- a/configs/components/ruby-3.2.rb +++ b/configs/components/ruby-3.2.rb @@ -82,7 +82,7 @@ special_flags = " --prefix=#{ruby_dir} --with-opt-dir=#{settings[:prefix]} " - if (platform.is_debian? && platform.os_version.to_i >= 13) || (platform.is_ubuntu? && platform.os_version =~ /25.04/ || platform.is_sles? && platform.os_version.to_i >= 16) + if (platform.is_debian? && platform.os_version.to_i >= 13) || (platform.is_ubuntu? && platform.os_version.to_f >= 25.04 || platform.is_sles? && platform.os_version.to_i >= 16) # A problem with --enable-dtrace, which I suspect may be because of GCC on the Trixie image. # Check if this is still needed next time we bump Ruby and/or bump the Debian 13 # container to the release version. diff --git a/configs/components/ruby-selinux.rb b/configs/components/ruby-selinux.rb index c37729fd..5c8c3f30 100644 --- a/configs/components/ruby-selinux.rb +++ b/configs/components/ruby-selinux.rb @@ -51,7 +51,7 @@ pkg.sha256sum 'ec2d2789f931152d21c1db1eb4bc202ce4eccede34d9be9e360e3b45243cee2c' pkg.build_requires 'python3-setuptools' pkg.url "https://github.com/SELinuxProject/selinux/releases/download/#{pkg.get_version}/libselinux-#{pkg.get_version}.tar.gz" - when /^fedora-43-/ + when /^(fedora-43-|ubuntu-26.04)/ pkg.version '3.9' pkg.sha256sum 'e7ee2c01dba64a0c35c9d7c9c0e06209d8186b325b0638a0d83f915cc3c101e8' pkg.build_requires 'python3-setuptools' diff --git a/configs/platforms/ubuntu-26.04-aarch64.rb b/configs/platforms/ubuntu-26.04-aarch64.rb new file mode 100644 index 00000000..eb4c0d14 --- /dev/null +++ b/configs/platforms/ubuntu-26.04-aarch64.rb @@ -0,0 +1,14 @@ +platform 'ubuntu-26.04-aarch64' 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(' ')}" +end diff --git a/configs/platforms/ubuntu-26.04-amd64.rb b/configs/platforms/ubuntu-26.04-amd64.rb new file mode 100644 index 00000000..bc1c9ab8 --- /dev/null +++ b/configs/platforms/ubuntu-26.04-amd64.rb @@ -0,0 +1,14 @@ +platform 'ubuntu-26.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(' ')}" +end diff --git a/configs/platforms/ubuntu-26.04-armhf.rb b/configs/platforms/ubuntu-26.04-armhf.rb new file mode 100644 index 00000000..ebbb9c1c --- /dev/null +++ b/configs/platforms/ubuntu-26.04-armhf.rb @@ -0,0 +1,14 @@ +platform 'ubuntu-26.04-armhf' 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(' ')}" +end