Skip to content

Commit f45b5aa

Browse files
mhashizumetvpartytonight
authored andcommitted
(PA-4514) Removes Ubuntu 16.04
Ubuntu 16.04 hit end-of-life in April 2021. This commit removes Ubuntu 16.04 from all Vanagon platforms, components, and projects.
1 parent 5074c63 commit f45b5aa

11 files changed

+6
-72
lines changed

Diff for: configs/components/boost.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
pkg.environment "CXXFLAGS", "-pthread"
118118
pkg.environment "PATH", "/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)"
119119
linkflags = "-Wl,-L#{settings[:libdir]},-L/opt/pl-build-tools/lib"
120-
elsif platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|16.04|18.04-amd64)/
120+
elsif platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
121121
pkg.environment "PATH", "/opt/pl-build-tools/bin:#{settings[:bindir]}:$(PATH)"
122122
linkflags = "-Wl,-rpath=#{settings[:libdir]},-rpath=#{settings[:libdir]}64"
123123
else

Diff for: configs/components/libicu.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
end
2020

2121
if platform.is_linux?
22-
if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-(?:16.04|18.04-amd64)/
22+
if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
2323
pkg.build_requires 'pl-gcc'
2424
else
2525
pkg.build_requires 'gcc'

Diff for: configs/components/ruby-2.5.9.rb

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
'solaris-11-sparc',
119119
'ubuntu-14.04-amd64',
120120
'ubuntu-14.04-i386',
121-
'ubuntu-16.04-ppc64el',
122121
'windows-2012r2-x64',
123122
'windows-2012r2-x86',
124123
'windows-2019-x64',

Diff for: configs/components/ruby-2.7.6.rb

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
'redhatfips-7-x86_64',
123123
'sles-12-ppc64le',
124124
'solaris-11-sparc',
125-
'ubuntu-16.04-ppc64el',
126125
'windows-2012r2-x64',
127126
'windows-2012r2-x86',
128127
'windows-2019-x64',

Diff for: configs/components/runtime-agent.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
4444
pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
4545
elsif platform.is_solaris? ||
46-
platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|16.04|18.04-amd64)/
46+
platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
4747
pkg.install do
4848
"bash runtime.sh #{libdir} puppet"
4949
end

Diff for: configs/components/runtime-client-tools.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# zlib is a runtime dependency of libcurl
1212
pkg.build_requires "pl-zlib-#{platform.architecture}"
1313
pkg.install_file "#{settings[:tools_root]}/bin/zlib1.dll", "#{settings[:bindir]}/zlib1.dll"
14-
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-(?:16.04|18.04-amd64)/
14+
elsif platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
1515
libbase = platform.architecture =~ /64/ ? 'lib64' : 'lib'
1616
libdir = "/opt/pl-build-tools/#{libbase}"
1717
pkg.add_source "file://resources/files/runtime/runtime.sh"

Diff for: configs/components/runtime-pe-installer.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
component "runtime-pe-installer" do |pkg, settings, platform|
33
pkg.environment "PROJECT_SHORTNAME", "installer"
44

5-
if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-(?:16.04|18.04-amd64)/
5+
if platform.name =~ /el-[67]|redhatfips-7|sles-12|ubuntu-18.04-amd64/
66
libbase = platform.architecture =~ /64/ ? 'lib64' : 'lib'
77
libdir = "/opt/pl-build-tools/#{libbase}"
88
pkg.add_source "file://resources/files/runtime/runtime.sh"

Diff for: configs/components/yaml-cpp.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
pkg.environment "CYGWIN", settings[:cygwin]
3535
cmake = "C:/ProgramData/chocolatey/bin/cmake.exe -G \"MinGW Makefiles\""
3636
cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
37-
elsif platform.is_aix? || platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|16.04|18.04-amd64)/
37+
elsif platform.is_aix? || platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
3838
cmake = "#{settings[:tools_root]}/bin/cmake"
3939
cmake_toolchain_file = "-DCMAKE_TOOLCHAIN_FILE=#{settings[:tools_root]}/pl-build-toolchain.cmake"
4040
else

Diff for: configs/platforms/ubuntu-16.04-amd64.rb

-17
This file was deleted.

Diff for: configs/platforms/ubuntu-16.04-i386.rb

-17
This file was deleted.

Diff for: configs/platforms/ubuntu-16.04-ppc64el.rb

-30
This file was deleted.

0 commit comments

Comments
 (0)