From 454f609aa6cb057772f56fdb7533ab9036ebd2ed Mon Sep 17 00:00:00 2001
From: zhanghongtong <rory-z@outlook.com>
Date: Fri, 12 Nov 2021 14:18:32 +0800
Subject: [PATCH] build: emqx package name scheme include otp version

---
 Makefile                     | 1 +
 build                        | 5 ++++-
 deploy/packages/deb/Makefile | 2 +-
 deploy/packages/rpm/Makefile | 2 +-
 scripts/get-otp-vsn.sh       | 7 +++++++
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100755 scripts/get-otp-vsn.sh

diff --git a/Makefile b/Makefile
index 17ceb9481..11edd8929 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ REBAR_VERSION = 3.14.3-emqx-8
 REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
+export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
 export EMQX_DESC ?= EMQ X
 export EMQX_CE_DASHBOARD_VERSION ?= v4.3.3
diff --git a/build b/build
index be4f88672..dbbfcbdfb 100755
--- a/build
+++ b/build
@@ -12,6 +12,9 @@ ARTIFACT="$2"
 # ensure dir
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
 
+OTP_VSN="${OTP_VSN:-$(./scripts/get-otp-vsn.sh)}"
+export OTP_VSN
+
 PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
 export PKG_VSN
 
@@ -116,7 +119,7 @@ make_zip() {
         log "ERROR: $tarball is not found"
     fi
     local zipball
-    zipball="${pkgpath}/${PROFILE}-${SYSTEM}-${PKG_VSN}-${ARCH}.zip"
+    zipball="${pkgpath}/${PROFILE}-${OTP_VSN}-${SYSTEM}-${PKG_VSN}-${ARCH}.zip"
     tar zxf "${tarball}" -C "${tard}/emqx"
     ## try to be portable for zip packages.
     ## for DEB and RPM packages the dependencies are resoved by yum and apt
diff --git a/deploy/packages/deb/Makefile b/deploy/packages/deb/Makefile
index 48124d780..6f3956409 100644
--- a/deploy/packages/deb/Makefile
+++ b/deploy/packages/deb/Makefile
@@ -8,7 +8,7 @@ EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD))
 
 TAR_PKG := $(EMQX_REL)/_build/$(EMQX_BUILD)/rel/emqx/emqx-$(PKG_VSN).tar.gz
 SOURCE_PKG := $(EMQX_NAME)_$(PKG_VSN)_$(shell dpkg --print-architecture)
-TARGET_PKG := $(EMQX_NAME)-$(SYSTEM)-$(PKG_VSN)-$(ARCH)
+TARGET_PKG := $(EMQX_NAME)-$(OTP_VSN)-$(SYSTEM)-$(PKG_VSN)-$(ARCH)
 
 .PHONY: all
 all: | $(BUILT)
diff --git a/deploy/packages/rpm/Makefile b/deploy/packages/rpm/Makefile
index 5a6e6bee4..e8c01e935 100644
--- a/deploy/packages/rpm/Makefile
+++ b/deploy/packages/rpm/Makefile
@@ -16,7 +16,7 @@ endif
 EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD))
 
 TAR_PKG := $(EMQX_REL)/_build/$(EMQX_BUILD)/rel/emqx/emqx-$(PKG_VSN).tar.gz
-TARGET_PKG := $(EMQX_NAME)-$(SYSTEM)-$(PKG_VSN)-$(ARCH)
+TARGET_PKG := $(EMQX_NAME)-$(OTP_VSN)-$(SYSTEM)-$(PKG_VSN)-$(ARCH)
 ifeq ($(RPM_REL),)
 	# no tail
 	RPM_REL := 1
diff --git a/scripts/get-otp-vsn.sh b/scripts/get-otp-vsn.sh
new file mode 100755
index 000000000..fd5b4fd0b
--- /dev/null
+++ b/scripts/get-otp-vsn.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+vsn=$(erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), "OTP_VERSION"])), io:fwrite(Version), halt().' -noshell)
+
+echo "otp${vsn}"