Skip to content

Commit

Permalink
Merge pull request #586 from mhashizume/PA-4573/master/remove_debian_9
Browse files Browse the repository at this point in the history
(PA-4573) Removes Debian 9
  • Loading branch information
joshcooper authored Sep 28, 2022
2 parents 0fcdf4d + 94b6df0 commit 4d1ee03
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 40 deletions.
4 changes: 2 additions & 2 deletions configs/components/_base-ruby-selinux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
host_ruby ||= settings[:host_ruby]
ruby_bindir ||= settings[:ruby_bindir]

if platform.name =~ /el-(6|7)|debian-9|ubuntu-(16|18.04-amd64)/
if platform.name =~ /el-(6|7)|ubuntu-(16|18.04-amd64)/
pkg.version "2.0.94"
pkg.md5sum "544f75aab11c2af352facc51af12029f"
pkg.url "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20100525/devel/libselinux-#{pkg.get_version}.tar.gz"
Expand Down Expand Up @@ -36,7 +36,7 @@
cflags = ""

# The platforms below use pl-build-tools
unless platform.name =~ /el-(6|7)|debian-9|ubuntu-(16|18.04-amd64)/
unless platform.name =~ /el-(6|7)|ubuntu-(16|18.04-amd64)/
cc = '/usr/bin/gcc'
cflags += "#{settings[:cppflags]} #{settings[:cflags]}"
end
Expand Down
6 changes: 1 addition & 5 deletions configs/components/augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@
pkg.environment "LDFLAGS", settings[:ldflags]
end
elsif platform.is_deb?
if platform.name =~ /debian-9/
pkg.requires 'libreadline7'
else
pkg.requires 'libreadline6'
end
pkg.requires 'libreadline6'

if platform.is_cross_compiled_linux?
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
Expand Down
2 changes: 1 addition & 1 deletion configs/components/boost.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
pkg.environment "CXXFLAGS", "-pthread"
pkg.environment "PATH", "/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)"
linkflags = "-Wl,-L#{settings[:libdir]},-L/opt/pl-build-tools/lib"
elsif platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
elsif platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
pkg.environment "PATH", "/opt/pl-build-tools/bin:#{settings[:bindir]}:$(PATH)"
linkflags = "-Wl,-rpath=#{settings[:libdir]},-rpath=#{settings[:libdir]}64"
else
Expand Down
2 changes: 1 addition & 1 deletion configs/components/runtime-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
elsif platform.is_solaris? ||
platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
pkg.install do
"bash runtime.sh #{libdir} puppet"
end
Expand Down
15 changes: 0 additions & 15 deletions configs/platforms/debian-9-amd64.rb

This file was deleted.

16 changes: 0 additions & 16 deletions configs/platforms/debian-9-i386.rb

This file was deleted.

0 comments on commit 4d1ee03

Please sign in to comment.