Skip to content

Commit

Permalink
erlang: bump to 25.3
Browse files Browse the repository at this point in the history
  • Loading branch information
fhunleth committed Mar 9, 2023
1 parent 60812b4 commit 25fc4c4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
erlang 25.2.3
erlang 25.3
28 changes: 14 additions & 14 deletions patches/buildroot/0007-erlang-support-OTP-21-25.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
From d5edb22e7c8044822a4b73014685967a2eff301d Mon Sep 17 00:00:00 2001
From efc85ded0de258a2ec97e9f1b95257f226a8eb6e Mon Sep 17 00:00:00 2001
From: Frank Hunleth <[email protected]>
Date: Tue, 11 Sep 2018 12:28:41 -0400
Subject: [PATCH] erlang: support OTP 21 - 25

This also adds the deterministic compile flag patch for OTP 21-24. On
OTP 25.2.3, it enables the configuration option for deterministic builds.
OTP 25.3, it enables the configuration option for deterministic builds.

Signed-off-by: Frank Hunleth <[email protected]>
---
Expand Down Expand Up @@ -50,8 +50,8 @@ Signed-off-by: Frank Hunleth <[email protected]>
create mode 100644 package/erlang/24.3.2/0002-erts-emulator-reorder-inclued-headers-paths.patch
create mode 100644 package/erlang/24.3.2/0003-erlang-enable-deterministic-builds.patch
create mode 100644 package/erlang/24.3.2/0004-disksup-update-df-call-to-work-with-Busybox.patch
create mode 100644 package/erlang/25.2.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
create mode 100644 package/erlang/25.2.3/0003-disksup-update-df-call-to-work-with-Busybox.patch
create mode 100644 package/erlang/25.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
create mode 100644 package/erlang/25.3/0003-disksup-update-df-call-to-work-with-Busybox.patch

diff --git a/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
deleted file mode 100644
Expand Down Expand Up @@ -991,11 +991,11 @@ index 0000000000..beb1957d46
+--
+2.25.1
+
diff --git a/package/erlang/25.2.3/0001-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/25.2.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
diff --git a/package/erlang/25.3/0001-erts-emulator-reorder-inclued-headers-paths.patch b/package/erlang/25.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
new file mode 100644
index 0000000000..069d69784e
--- /dev/null
+++ b/package/erlang/25.2.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
+++ b/package/erlang/25.3/0001-erts-emulator-reorder-inclued-headers-paths.patch
@@ -0,0 +1,49 @@
+From fe9a45130bcf1fc80a15628fbf14bf5619d84c1a Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
Expand Down Expand Up @@ -1046,11 +1046,11 @@ index 0000000000..069d69784e
+--
+2.25.1
+
diff --git a/package/erlang/25.2.3/0003-disksup-update-df-call-to-work-with-Busybox.patch b/package/erlang/25.2.3/0003-disksup-update-df-call-to-work-with-Busybox.patch
diff --git a/package/erlang/25.3/0003-disksup-update-df-call-to-work-with-Busybox.patch b/package/erlang/25.3/0003-disksup-update-df-call-to-work-with-Busybox.patch
new file mode 100644
index 0000000000..97f410b18c
--- /dev/null
+++ b/package/erlang/25.2.3/0003-disksup-update-df-call-to-work-with-Busybox.patch
+++ b/package/erlang/25.3/0003-disksup-update-df-call-to-work-with-Busybox.patch
@@ -0,0 +1,28 @@
+From 2275a2743b85c8915ff64d487cfe0fd1367424e8 Mon Sep 17 00:00:00 2001
+From: Frank Hunleth <[email protected]>
Expand Down Expand Up @@ -1129,14 +1129,14 @@ index 15931b5896..1ad7f4868a 100644
bool "install megaco application"
help
diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash
index 338545a0ba..12bb86b0d4 100644
index 338545a0ba..ce0cc9a496 100644
--- a/package/erlang/erlang.hash
+++ b/package/erlang/erlang.hash
@@ -1,5 +1,13 @@
-# From https://github.com/erlang/otp/releases/download/OTP-22.3.4.22/SHA256.txt
-sha256 e7f0793e62f8da4f7551dc9c1c0de76c40f19773ba516121fc56315c840f60cc otp_src_22.3.4.22.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-25.2.3/SHA256.txt
+sha256 f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c otp_src_25.2.3.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-25.3/SHA256.txt
+sha256 85c447efc1746740df4089d75bc0e47b88d5161d7c44e9fc4c20fa33ea5d19d7 otp_src_25.3.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-24.3.2/SHA256.txt
+sha256 fb39eecf5a5710200871c85c11251e27afce7c2a11f569bd6394c6d48240ec8d otp_src_24.3.2.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-23.3.4.14/SHA256.txt
Expand All @@ -1149,7 +1149,7 @@ index 338545a0ba..12bb86b0d4 100644
# Hash for license file
sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index a76bda4437..1b3a793b4a 100644
index a76bda4437..3501733a22 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -4,8 +4,31 @@
Expand All @@ -1176,8 +1176,8 @@ index a76bda4437..1b3a793b4a 100644
+ERLANG_VERSION = 24.3.2
+ERLANG_ERTS_VSN = 12.3
+else
+ERLANG_VERSION = 25.2.3
+ERLANG_ERTS_VSN = 13.1.5
+ERLANG_VERSION = 25.3
+ERLANG_ERTS_VSN = 13.2
+endif
+endif
+endif
Expand Down
2 changes: 1 addition & 1 deletion support/docker/nerves_system_br/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hexpm/erlang:25.2.3-ubuntu-jammy-20221130
FROM hexpm/erlang:25.3-ubuntu-jammy-20230126
LABEL maintainer="Nerves Project developers <[email protected]>" \
vendor="NervesProject" \
description="Container with everything needed to build Nerves Systems"
Expand Down

0 comments on commit 25fc4c4

Please sign in to comment.