From 4fbc64d84ef2525dde57cbb738a3ab5dd79cf305 Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Mon, 14 Dec 2020 10:21:23 +0100
Subject: [PATCH] chore(release): Add OTP_VERSION file to release dir

---
 etc/BUILT_ON     |  1 +
 rebar.config     |  5 ++---
 rebar.config.erl | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 etc/BUILT_ON

diff --git a/etc/BUILT_ON b/etc/BUILT_ON
new file mode 100644
index 000000000..2997223fa
--- /dev/null
+++ b/etc/BUILT_ON
@@ -0,0 +1 @@
+{{built_on_arch}}
diff --git a/rebar.config b/rebar.config
index 14287f470..52a4a7292 100644
--- a/rebar.config
+++ b/rebar.config
@@ -28,9 +28,8 @@
 {cover_excl_mods, [emqx_exproto_pb, emqx_exhook_pb]}.
 
 {provider_hooks,[{pre,[{release,{relup_helper,gen_appups}}]},
-                 {post,[{release,{relup_helper,otp_vsn}},
-                 {release,{relup_helper,untar}}
-                ]}]}.
+                 {post,[{release,{relup_helper,untar}}]}
+                ]}.
 
 {post_hooks,[]}.
 
diff --git a/rebar.config.erl b/rebar.config.erl
index 02090655b..592cfa74a 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -65,24 +65,27 @@ relx(Profile) ->
 do_relx('emqx', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     , {overlay, relx_overlay(cloud)}
-    , {overlay_vars,["vars/vars-cloud.config","vars/vars-bin.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-cloud.config","vars/vars-bin.config"])}
     ];
 do_relx('emqx-pkg', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(cloud)}
     , {overlay, relx_overlay(cloud)}
-    , {overlay_vars,["vars/vars-cloud.config","vars/vars-pkg.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-cloud.config","vars/vars-pkg.config"])}
     ];
 do_relx('emqx-edge', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     , {overlay, relx_overlay(edge)}
-    , {overlay_vars,["vars/vars-edge.config","vars/vars-bin.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-edge.config","vars/vars-bin.config"])}
     ];
 do_relx('emqx-edge-pkg', Vsn) ->
     [ {release, {emqx, Vsn}, relx_apps(edge)}
     , {overlay, relx_overlay(edge)}
-    , {overlay_vars,["vars/vars-edge.config","vars/vars-pkg.config"]}
+    , {overlay_vars, overlay_vars(["vars/vars-edge.config","vars/vars-pkg.config"])}
     ].
 
+overlay_vars(Files) ->
+    [{built_on_arch, rebar_utils:get_arch()} | Files].
+
 relx_apps(ReleaseType) ->
     [ kernel
     , sasl
@@ -177,6 +180,7 @@ etc_overlay(ReleaseType) ->
                 lists:append([plugin_etc_overlays(App) || App <- PluginApps]),
     [ {mkdir, "etc/"}
     , {mkdir, "etc/plugins"}
+    , {template, "etc/BUILT_ON", "releases/{{release_version}}/BUILT_ON"}
     , {copy, "{{base_dir}}/lib/emqx/etc/certs","etc/"}
     ] ++
     lists:map(