From 26977e75fc290cbcc180b4d35581f0c1c903a057 Mon Sep 17 00:00:00 2001 From: isaac-hammes Date: Wed, 21 Jun 2023 09:12:34 -0700 Subject: [PATCH] (PA-5047) Remove Red Hat 7 (aarch64) from pl-build-tools-vanagon. --- configs/components/gcc.rb | 2 +- configs/components/sysroot.rb | 3 --- configs/platforms/el-7-aarch64.rb | 3 --- configs/projects/pl-gcc.rb | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 configs/platforms/el-7-aarch64.rb diff --git a/configs/components/gcc.rb b/configs/components/gcc.rb index 0365ebe..8849da1 100644 --- a/configs/components/gcc.rb +++ b/configs/components/gcc.rb @@ -1,6 +1,6 @@ component "gcc" do |pkg, settings, platform| # Source-Related Metadata - if platform.name =~ /el-7-aarch64|el-7-ppc64|sles-12-ppc64le|ubuntu-18\.(04|10)/ + if platform.name =~ /el-7-ppc64|sles-12-ppc64le|ubuntu-18\.(04|10)/ pkg.version "6.1.0" pkg.md5sum "8d04cbdfddcfad775fdbc5e112af2690" elsif platform.is_aix? || platform.architecture =~ /arm/ diff --git a/configs/components/sysroot.rb b/configs/components/sysroot.rb index d0137a5..a61d5b0 100644 --- a/configs/components/sysroot.rb +++ b/configs/components/sysroot.rb @@ -1,8 +1,5 @@ component "sysroot" do |pkg, settings, platform| case platform.name - when "el-7-aarch64" - pkg.version "2017.06.13" - pkg.md5sum "b1cb6fc6253a2bbb5cc17fda16ec64ae" when "el-7-ppc64" # Centos 7.5 - Infrastructure Server Install pkg.version "2018.09.14" pkg.md5sum "9aa45667c6b265fd2f356ee650bf0e27" diff --git a/configs/platforms/el-7-aarch64.rb b/configs/platforms/el-7-aarch64.rb deleted file mode 100644 index 173b0d4..0000000 --- a/configs/platforms/el-7-aarch64.rb +++ /dev/null @@ -1,3 +0,0 @@ -platform "el-7-aarch64" do |plat| - plat.inherit_from_default -end diff --git a/configs/projects/pl-gcc.rb b/configs/projects/pl-gcc.rb index f84a3f1..4acf72e 100644 --- a/configs/projects/pl-gcc.rb +++ b/configs/projects/pl-gcc.rb @@ -4,7 +4,7 @@ proj.description 'Puppet Labs GCC' - if platform.name =~ /el-7-aarch64|el-7-ppc64|sles-12-ppc64le|ubuntu-18\.(04|10)/ + if platform.name =~ /el-7-ppc64|sles-12-ppc64le|ubuntu-18\.(04|10)/ proj.version '6.1.0' proj.release '6' elsif platform.is_aix? || platform.architecture =~ /arm/