Merge pull request #121 from joshcooper/amazon2

Rename Amazon 7 to 2
puppetlabs · Jun 3, 2024 · 9075e43 · 9075e43
2 parents 79525df + 6bf00a0
commit 9075e43
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/configs/components/cpp-hocon.rb b/configs/components/cpp-hocon.rb
@@ -59,7 +59,7 @@
     toolchain = ''
     boost_static_flag = '-DBOOST_STATIC=OFF'
     special_flags = " -DENABLE_CXX_WERROR=OFF -DCMAKE_CXX_FLAGS='#{settings[:cflags]}'"
-    cmake = if platform.name =~ /amazon-7-aarch64/
+    cmake = if platform.name =~ /amazon-2-aarch64/
               '/usr/bin/cmake3'
             else
               'cmake'

diff --git a/configs/components/cpp-pcp-client.rb b/configs/components/cpp-pcp-client.rb
@@ -71,7 +71,7 @@
     toolchain = ''
     platform_flags = "-DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wimplicit-fallthrough=0'"
     special_flags = ' -DENABLE_CXX_WERROR=OFF'
-    cmake = if platform.name =~ /amazon-7-aarch64/
+    cmake = if platform.name =~ /amazon-2-aarch64/
               '/usr/bin/cmake3'
             else
               'cmake'

diff --git a/configs/components/leatherman.rb b/configs/components/leatherman.rb
@@ -111,7 +111,7 @@
 
     # Workaround for hanging leatherman tests (-fno-strict-overflow)
     special_flags = " -DENABLE_CXX_WERROR=OFF -DCMAKE_CXX_FLAGS='#{settings[:cflags]} -fno-strict-overflow -Wno-deprecated-declarations' "
-    cmake = if platform.name =~ /amazon-7-aarch64/
+    cmake = if platform.name =~ /amazon-2-aarch64/
               '/usr/bin/cmake3'
             else
               'cmake'

diff --git a/configs/components/pxp-agent.rb b/configs/components/pxp-agent.rb
@@ -82,7 +82,7 @@
     toolchain = ''
     special_flags += " -DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wno-deprecated -Wimplicit-fallthrough=0' "
     special_flags += ' -DENABLE_CXX_WERROR=OFF ' unless platform.name =~ /sles-15/
-    cmake = if platform.name =~ /amazon-7-aarch64/
+    cmake = if platform.name =~ /amazon-2-aarch64/
               '/usr/bin/cmake3'
             else
               'cmake'

diff --git a/configs/platforms/amazon-2-aarch64.rb b/configs/platforms/amazon-2-aarch64.rb
@@ -0,0 +1,3 @@
+platform "amazon-2-aarch64" do |plat|
+  plat.inherit_from_default
+end
diff --git a/configs/platforms/amazon-7-aarch64.rb b/configs/platforms/amazon-7-aarch64.rb