Bläddra i källkod

Merge pull request #5605 from qzhuyan/dev/william/centos7-rpm-spec-openssl11

chore: centos7 add openssl11 dep in rpm spec
William Yang 4 år sedan
förälder
incheckning
da4e3f47a3
2 ändrade filer med 8 tillägg och 0 borttagningar
  1. 2 0
      .ci/build_packages/tests.sh
  2. 6 0
      deploy/packages/rpm/emqx.spec

+ 2 - 0
.ci/build_packages/tests.sh

@@ -91,6 +91,8 @@ emqx_test(){
             ;;
             ;;
             "rpm")
             "rpm")
                 packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.rpm)
                 packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.rpm)
+                # EMQX OTP requires openssl11 to have TLS1.3 support
+                yum install -y openssl11
                 rpm -ivh "${PACKAGE_PATH}/${packagename}"
                 rpm -ivh "${PACKAGE_PATH}/${packagename}"
                 if ! rpm -q emqx | grep -q emqx; then
                 if ! rpm -q emqx | grep -q emqx; then
                     echo "package install error"
                     echo "package install error"

+ 6 - 0
deploy/packages/rpm/emqx.spec

@@ -19,6 +19,12 @@ BuildRoot: %{_tmppath}/%{_name}-%{_version}-root
 Provides: %{_name}
 Provides: %{_name}
 AutoReq: 0
 AutoReq: 0
 
 
+%if 0%{?rhel} == 7
+Requires: openssl11 libatomic
+%else
+Requires: libatomic
+%endif
+
 %description
 %description
 EMQX, a distributed, massively scalable, highly extensible MQTT message broker written in Erlang/OTP.
 EMQX, a distributed, massively scalable, highly extensible MQTT message broker written in Erlang/OTP.