Skip to content

Commit

Permalink
erlang: bump to 27.2
Browse files Browse the repository at this point in the history
  • Loading branch information
fhunleth committed Jan 9, 2025
1 parent 6b35817 commit 6c03026
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
erlang 27.1.3
erlang 27.2
20 changes: 10 additions & 10 deletions patches/buildroot/0007-erlang-support-OTP-21-27.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4a5e73d6569c7b877e1f91089691c9db7a5b4b63 Mon Sep 17 00:00:00 2001
From dde4514fcc77fb831c85a9da80edb54723d6ff83 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 - 27
Expand Down Expand Up @@ -54,7 +54,7 @@ Signed-off-by: Frank Hunleth <[email protected]>
create mode 100644 package/erlang/25.3.2/0003-disksup-update-df-call-to-work-with-Busybox.patch
create mode 100644 package/erlang/26.2.5/0001-disksup-update-df-call-to-work-with-Busybox.patch
create mode 100644 package/erlang/26.2.5/0002-erlang-libei-arch-compile.patch
create mode 100644 package/erlang/27.1.3/0001-disksup-update-df-call-to-work-with-Busybox.patch
create mode 100644 package/erlang/27.2/0001-disksup-update-df-call-to-work-with-Busybox.patch

diff --git a/package/erlang/21.3.8.24/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package/erlang/21.3.8.24/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
new file mode 100644
Expand Down Expand Up @@ -1075,11 +1075,11 @@ index 0000000000..5a3c729289
+--
+2.44.0
+
diff --git a/package/erlang/27.1.3/0001-disksup-update-df-call-to-work-with-Busybox.patch b/package/erlang/27.1.3/0001-disksup-update-df-call-to-work-with-Busybox.patch
diff --git a/package/erlang/27.2/0001-disksup-update-df-call-to-work-with-Busybox.patch b/package/erlang/27.2/0001-disksup-update-df-call-to-work-with-Busybox.patch
new file mode 100644
index 0000000000..b621381b4c
--- /dev/null
+++ b/package/erlang/27.1.3/0001-disksup-update-df-call-to-work-with-Busybox.patch
+++ b/package/erlang/27.2/0001-disksup-update-df-call-to-work-with-Busybox.patch
@@ -0,0 +1,77 @@
+From e85fabb333c9c03bf8b69c6edf49413a57fd5e86 Mon Sep 17 00:00:00 2001
+From: Frank Hunleth <[email protected]>
Expand Down Expand Up @@ -1217,14 +1217,14 @@ index 724f91123b..1f98a54eea 100644
bool "install megaco application"
help
diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash
index 9fc5a6eabf..95e220de52 100644
index 9fc5a6eabf..80b62e4e86 100644
--- a/package/erlang/erlang.hash
+++ b/package/erlang/erlang.hash
@@ -1,5 +1,17 @@
-# From https://github.com/erlang/otp/releases/download/OTP-26.0.2/SHA256.txt
-sha256 47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193 otp_src_26.0.2.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-27.1.3/SHA256.txt
+sha256 1b1eb1ed919625caed3dd56e97182956613b3d650556ba1b8b2d6c9bc0c51c28 otp_src_27.1.3.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-27.2/SHA256.txt
+sha256 b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d otp_src_27.2.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-26.2.5/SHA256.txt
+sha256 de155c4ad9baab2b9e6c96dbd03bf955575a04dd6feee9c08758beb28484c9f6 otp_src_26.2.5.tar.gz
+# From https://github.com/erlang/otp/releases/download/OTP-25.3.2/SHA256.txt
Expand All @@ -1241,7 +1241,7 @@ index 9fc5a6eabf..95e220de52 100644
# Hash for license file
sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE.txt
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index c05c51fff4..b0a8aae006 100644
index c05c51fff4..04af1006c9 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -4,7 +4,39 @@
Expand Down Expand Up @@ -1274,8 +1274,8 @@ index c05c51fff4..b0a8aae006 100644
+ERLANG_VERSION = 26.2.5
+ERLANG_ERTS_VSN = 14.2.5
+else
+ERLANG_VERSION = 27.1.3
+ERLANG_ERTS_VSN = 15.1.3
+ERLANG_VERSION = 27.2
+ERLANG_ERTS_VSN = 15.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:27.1.3-ubuntu-jammy-20240808
FROM hexpm/erlang:27.2-ubuntu-jammy-20240808
LABEL maintainer="Nerves Project developers <[email protected]>" \
vendor="NervesProject" \
description="Container with everything needed to build Nerves Systems"
Expand Down

0 comments on commit 6c03026

Please sign in to comment.