Skip to content

Commit 47fa84a

Browse files
committed
Remove references to SLES 11
1 parent 9345558 commit 47fa84a

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

configs/components/ruby-3.2.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
'macos-all-arm64',
154154
'macos-all-x86_64',
155155
'redhatfips-7-x86_64',
156-
'sles-11-x86_64',
157156
'sles-12-ppc64le',
158157
'solaris-11-sparc',
159158
'solaris-113-sparc',

configs/components/ruby-shadow.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
pkg.build_requires "ruby-#{settings[:ruby_version]}"
1111
if !platform.is_cross_compiled? && platform.architecture == 'sparc'
1212
pkg.environment "PATH", "$(PATH):/opt/pl-build-tools/bin:/usr/ccs/bin:/usr/sfw/bin"
13-
elsif platform.name == 'sles-11-x86_64'
14-
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
1513
else
1614
pkg.environment "PATH", "$(PATH):/usr/ccs/bin:/usr/sfw/bin"
1715
end

configs/components/runtime-agent.rb

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,7 @@
33
pkg.environment "PROJECT_SHORTNAME", "puppet"
44
pkg.add_source "file://resources/files/runtime/runtime.sh"
55

6-
if platform.name =~ /sles-11-x86_64/
7-
if settings[:ruby_version] =~ /2.7/
8-
pkg.install do
9-
"zypper install -y pl-gcc=4.8.2-1"
10-
end
11-
else
12-
pkg.install do
13-
"zypper install -y pl-gcc8"
14-
end
15-
end
16-
elsif platform.is_macos? && platform.is_cross_compiled?
6+
if platform.is_macos? && platform.is_cross_compiled?
177
if settings[:ruby_version] =~ /^3\./
188
pkg.install do
199
# These are dependencies of [email protected], remove symlinks from /usr/local
@@ -65,7 +55,7 @@
6555
pkg.install_file "#{settings[:tools_root]}/bin/libgdbm_compat-4.dll", "#{settings[:ruby_bindir]}/libgdbm_compat-4.dll"
6656
pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
6757
elsif platform.is_solaris? ||
68-
platform.name =~ /el-[56]|redhatfips-7|sles-(:?11)/
58+
platform.name =~ /redhatfips-7/
6959
pkg.install do
7060
"bash runtime.sh #{libdir} puppet"
7161
end

0 commit comments

Comments
 (0)