yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: remove otp version from rpm package name

This commit is contained in:
Ivan Dyachkov 2023-02-15 10:21:07 +01:00
parent 83a7da8bc0
commit 4f75dbbe7f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/packages/rpm/Makefile
View File

@ -7,13 +7,12 @@ none :=
space := $(none) $(none) space := $(none) $(none)
## RPM does not allow '-' in version number and release string, replace with '_' ## RPM does not allow '-' in version number and release string, replace with '_'
RPM_VSN := $(subst -,_,$(PKG_VSN)) RPM_VSN := $(subst -,_,$(PKG_VSN))
RPM_REL := otp$(subst -,_,$(OTP_VSN))
EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD)) EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD))
TAR_PKG_DIR ?= _build/$(EMQX_BUILD)/rel/emqx TAR_PKG_DIR ?= _build/$(EMQX_BUILD)/rel/emqx
TAR_PKG := $(EMQX_REL)/$(TAR_PKG_DIR)/emqx-$(PKG_VSN).tar.gz TAR_PKG := $(EMQX_REL)/$(TAR_PKG_DIR)/emqx-$(PKG_VSN).tar.gz
SOURCE_PKG := emqx-$(RPM_VSN)-$(RPM_REL).$(shell uname -m) SOURCE_PKG := emqx-$(RPM_VSN).$(shell uname -m)
TARGET_PKG := $(EMQX_NAME)-$(shell $(EMQX_REL)/pkg-vsn.sh $(EMQX_NAME) --long) TARGET_PKG := $(EMQX_NAME)-$(shell $(EMQX_REL)/pkg-vsn.sh $(EMQX_NAME) --long)
# Not $(PWD) as it does not work for make -C # Not $(PWD) as it does not work for make -C
@ -33,7 +32,6 @@ all: | $(BUILT)
--define "_topdir $(TOPDIR)" \ --define "_topdir $(TOPDIR)" \
--define "_version $(RPM_VSN)" \ --define "_version $(RPM_VSN)" \
--define "_reldir $(SRCDIR)" \ --define "_reldir $(SRCDIR)" \
--define "_release $(RPM_REL)" \
--define "_post_addition $(POST_ADDITION)" \ --define "_post_addition $(POST_ADDITION)" \
--define "_preun_addition $(PREUN_ADDITION)" \ --define "_preun_addition $(PREUN_ADDITION)" \
--define "_sharedstatedir /var/lib" \ --define "_sharedstatedir /var/lib" \

4
deploy/packages/rpm/emqx.spec
View File

@ -5,12 +5,12 @@
%define _log_dir %{_var}/log/%{_name} %define _log_dir %{_var}/log/%{_name}
%define _lib_home /usr/lib/%{_name} %define _lib_home /usr/lib/%{_name}
%define _var_home %{_sharedstatedir}/%{_name} %define _var_home %{_sharedstatedir}/%{_name}
%define _build_name_fmt %{_arch}/%{_name}-%{_version}-%{_release}.%{_arch}.rpm %define _build_name_fmt %{_arch}/%{_name}-%{_version}.%{_arch}.rpm
%define _build_id_links none %define _build_id_links none
Name: %{_package_name} Name: %{_package_name}
Version: %{_version} Version: %{_version}
Release: %{_release}%{?dist} Release: 1%{?dist}
Summary: emqx Summary: emqx
Group: System Environment/Daemons Group: System Environment/Daemons
License: Apache License Version 2.0 License: Apache License Version 2.0