chore: remove otp version from rpm package name
This commit is contained in:
parent
83a7da8bc0
commit
4f75dbbe7f
|
@ -7,13 +7,12 @@ none :=
|
|||
space := $(none) $(none)
|
||||
## RPM does not allow '-' in version number and release string, replace with '_'
|
||||
RPM_VSN := $(subst -,_,$(PKG_VSN))
|
||||
RPM_REL := otp$(subst -,_,$(OTP_VSN))
|
||||
|
||||
EMQX_NAME=$(subst -pkg,,$(EMQX_BUILD))
|
||||
|
||||
TAR_PKG_DIR ?= _build/$(EMQX_BUILD)/rel/emqx
|
||||
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)
|
||||
|
||||
# Not $(PWD) as it does not work for make -C
|
||||
|
@ -33,7 +32,6 @@ all: | $(BUILT)
|
|||
--define "_topdir $(TOPDIR)" \
|
||||
--define "_version $(RPM_VSN)" \
|
||||
--define "_reldir $(SRCDIR)" \
|
||||
--define "_release $(RPM_REL)" \
|
||||
--define "_post_addition $(POST_ADDITION)" \
|
||||
--define "_preun_addition $(PREUN_ADDITION)" \
|
||||
--define "_sharedstatedir /var/lib" \
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
%define _log_dir %{_var}/log/%{_name}
|
||||
%define _lib_home /usr/lib/%{_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
|
||||
|
||||
Name: %{_package_name}
|
||||
Version: %{_version}
|
||||
Release: %{_release}%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: emqx
|
||||
Group: System Environment/Daemons
|
||||
License: Apache License Version 2.0
|
||||
|
|
Loading…
Reference in New Issue