From afc18e7f49967e6ae69cf873f2cc789bcefb3f82 Mon Sep 17 00:00:00 2001
From: Cameron E Baird <cameronbaird@microsoft.com>
Date: Wed, 26 Jan 2022 15:31:25 -0800
Subject: [PATCH] [main] cherry-pick erlang update from 1.0 (#1986)

* cherry-pick erlang update from 1.0

* make erlang spec uniform
---
 SPECS/erlang/erlang.signatures.json |  2 +-
 SPECS/erlang/erlang.spec            | 44 ++++++++++++++++++-----------
 cgmanifest.json                     |  4 +--
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/SPECS/erlang/erlang.signatures.json b/SPECS/erlang/erlang.signatures.json
index 4dc97e2cac..b8db20cf1e 100644
--- a/SPECS/erlang/erlang.signatures.json
+++ b/SPECS/erlang/erlang.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "otp-OTP-22.0.7.tar.gz": "04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc"
+  "otp-OTP-24.2.tar.gz": "0b9c9ba7d8b40f6c77d529e07561b10f0914d2bfe9023294d7eda85b62936792"
  }
 }
\ No newline at end of file
diff --git a/SPECS/erlang/erlang.spec b/SPECS/erlang/erlang.spec
index eb8bb731de..21a88328bc 100644
--- a/SPECS/erlang/erlang.spec
+++ b/SPECS/erlang/erlang.spec
@@ -1,8 +1,8 @@
 %define  debug_package %{nil}
 Name:         erlang
 Summary:      erlang
-Version:      22.0.7
-Release:      2%{?dist}
+Version:      24.2
+Release:      1%{?dist}
 Group:        Development/Languages
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -26,7 +26,7 @@ make
 
 %install
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 %post
 
@@ -39,22 +39,32 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %exclude %{_libdir}/debug
 
 %changelog
-* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 22.0.7-2
-- Added %%license line automatically
+*   Wed Jan 19 2022 Cameron Baird <cameronbaird@microsoft.com> - 24.2-1
+-   Update to version 24.2
+
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 22.0.7-2
+-   Added %%license line automatically
 
 *   Thu Mar 19 2020 Henry Beberman <henry.beberman@microsoft.com> 22.0.7-1
 -   Update to 22.0.7. Fix URL. Fix Source0 URL. License verified.
+
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 19.3-4
 -   Initial CBL-Mariner import from Photon (license: Apache2).
-* Thu Jan 31 2019 Siju Maliakkal <smaliakkal@vmware.com> 19.3-3
-- Revert to old version to fix rabbitmq-server startup failure
-* Fri Dec 07 2018 Ashwin H <ashwinh@vmware.com> 21.1.4-1
-- Update to version 21.1.4
-* Mon Sep 24 2018 Dweep Advani <dadvani@vmware.com> 21.0-1
-- Update to version 21.0
-* Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 19.3-2
-- Remove BuildArch
-* Thu Apr 06 2017 Chang Lee <changlee@vmware.com> 19.3-1
-- Updated Version
-* Mon Dec 12 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19.1-1
-- Initial.
+
+*   Thu Jan 31 2019 Siju Maliakkal <smaliakkal@vmware.com> 19.3-3
+-   Revert to old version to fix rabbitmq-server startup failure
+
+*   Fri Dec 07 2018 Ashwin H <ashwinh@vmware.com> 21.1.4-1
+-   Update to version 21.1.4
+
+*   Mon Sep 24 2018 Dweep Advani <dadvani@vmware.com> 21.0-1
+-   Update to version 21.0
+
+*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 19.3-2
+-   Remove BuildArch
+
+*   Thu Apr 06 2017 Chang Lee <changlee@vmware.com> 19.3-1
+-   Updated Version
+
+*   Mon Dec 12 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19.1-1
+-   Initial.
diff --git a/cgmanifest.json b/cgmanifest.json
index 0a4dc76605..07987b23b8 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -3348,8 +3348,8 @@
         "type": "other",
         "other": {
           "name": "erlang",
-          "version": "22.0.7",
-          "downloadUrl": "https://github.com/erlang/otp/archive/OTP-22.0.7/otp-OTP-22.0.7.tar.gz"
+          "version": "24.2",
+          "downloadUrl": "https://github.com/erlang/otp/archive/OTP-24.2/otp-OTP-24.2.tar.gz"
         }
       }
     },