From 13d5e7425a5fd016e4dae7b5d4536deced7ffd3f Mon Sep 17 00:00:00 2001
From: Saurabh Pandit <saurabh.pandit@perforce.com>
Date: Fri, 20 Oct 2023 19:26:48 +0530
Subject: [PATCH 1/2] [PA-5567] : Added platform for amazon-linux-2023 x86_64 &
 aarch64

---
 configs/platforms/amazon-2023-aarch64.rb | 18 +++++++++++
 configs/platforms/amazon-2023-x86_64.rb  | 38 ++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 configs/platforms/amazon-2023-aarch64.rb
 create mode 100644 configs/platforms/amazon-2023-x86_64.rb

diff --git a/configs/platforms/amazon-2023-aarch64.rb b/configs/platforms/amazon-2023-aarch64.rb
new file mode 100644
index 000000000..23a8299a9
--- /dev/null
+++ b/configs/platforms/amazon-2023-aarch64.rb
@@ -0,0 +1,18 @@
+platform 'amazon-2023-aarch64' do |plat|
+  plat.inherit_from_default
+
+  packages = %w(
+    perl
+    perl-Getopt-Long
+    java-1.8.0-amazon-corretto-devel
+    patch
+    swig
+    libselinux-devel
+    readline-devel
+    zlib-devel
+    systemtap-sdt-devel
+  )
+  plat.provision_with("dnf install -y --allowerasing  #{packages.join(' ')}")
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "amazon-2023-arm64"
+end
diff --git a/configs/platforms/amazon-2023-x86_64.rb b/configs/platforms/amazon-2023-x86_64.rb
new file mode 100644
index 000000000..600d52f7e
--- /dev/null
+++ b/configs/platforms/amazon-2023-x86_64.rb
@@ -0,0 +1,38 @@
+platform "amazon-2023-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(
+    gcc
+    gcc-c++
+    autoconf
+    automake
+    createrepo
+    rsync
+    cmake
+    make
+    rpm-libs
+    rpm-build
+    rpm-sign
+    libtool
+    libarchive
+    java-1.8.0-amazon-corretto-devel
+    libsepol
+    libsepol-devel
+    libselinux-devel
+    pkgconfig
+    readline-devel
+    rpmdevtools
+    swig
+    systemtap-sdt-devel
+    yum-utils
+    zlib-devel
+    perl-FindBin
+    perl-lib
+  )
+
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "amazon-2023-x86_64"
+end

From 34c902af5e2160245c6c50189fd274782d382cc7 Mon Sep 17 00:00:00 2001
From: Saurabh Pandit <saurabh.pandit@perforce.com>
Date: Mon, 30 Oct 2023 19:40:02 +0530
Subject: [PATCH 2/2] [PA-5567] : Removed extra packages from x86_64 & aarch64
 platform files

---
 configs/platforms/amazon-2023-aarch64.rb | 26 +++++++-------
 configs/platforms/amazon-2023-x86_64.rb  | 44 +++++++-----------------
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/configs/platforms/amazon-2023-aarch64.rb b/configs/platforms/amazon-2023-aarch64.rb
index 23a8299a9..8390dfac3 100644
--- a/configs/platforms/amazon-2023-aarch64.rb
+++ b/configs/platforms/amazon-2023-aarch64.rb
@@ -1,18 +1,20 @@
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
 platform 'amazon-2023-aarch64' do |plat|
   plat.inherit_from_default
 
-  packages = %w(
-    perl
-    perl-Getopt-Long
-    java-1.8.0-amazon-corretto-devel
-    patch
-    swig
-    libselinux-devel
+  packages = %w[
+    perl-FindBin
+    perl-lib
     readline-devel
-    zlib-devel
     systemtap-sdt-devel
-  )
-  plat.provision_with("dnf install -y --allowerasing  #{packages.join(' ')}")
-  plat.install_build_dependencies_with "dnf install -y --allowerasing "
-  plat.vmpooler_template "amazon-2023-arm64"
+    zlib-devel
+  ]
+
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with 'dnf install -y --allowerasing'
+  plat.vmpooler_template 'amazon-2023-arm64'
 end
+
+# rubocop:enable Naming/FileName
diff --git a/configs/platforms/amazon-2023-x86_64.rb b/configs/platforms/amazon-2023-x86_64.rb
index 600d52f7e..9f35bf530 100644
--- a/configs/platforms/amazon-2023-x86_64.rb
+++ b/configs/platforms/amazon-2023-x86_64.rb
@@ -1,38 +1,20 @@
-platform "amazon-2023-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
 
-  packages = %w(
-    gcc
-    gcc-c++
-    autoconf
-    automake
-    createrepo
-    rsync
-    cmake
-    make
-    rpm-libs
-    rpm-build
-    rpm-sign
-    libtool
-    libarchive
-    java-1.8.0-amazon-corretto-devel
-    libsepol
-    libsepol-devel
-    libselinux-devel
-    pkgconfig
+platform 'amazon-2023-x86_64' do |plat|
+  plat.inherit_from_default
+
+  packages = %w[
+    perl-FindBin
+    perl-lib
     readline-devel
-    rpmdevtools
-    swig
     systemtap-sdt-devel
-    yum-utils
     zlib-devel
-    perl-FindBin
-    perl-lib
-  )
+  ]
 
   plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
-  plat.install_build_dependencies_with "dnf install -y --allowerasing "
-  plat.vmpooler_template "amazon-2023-x86_64"
+  plat.install_build_dependencies_with 'dnf install -y --allowerasing'
+  plat.vmpooler_template 'amazon-2023-x86_64'
 end
+
+# rubocop:enable Naming/FileName