technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: fixed an ability to override package version.

Browse Source 
This was broken since 00d8049418cf.
This commit is contained in:
Andrei Belov
2020-12-24 16:17:27 +03:00
parent c369e25ae7
commit c981ac6558
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/deb/Makefile
View File

@@ -2,9 +2,10 @@
include ../../version include ../../version
DEFAULT_VERSION := $(NXT_VERSION)
DEFAULT_RELEASE := 1 DEFAULT_RELEASE := 1
VERSION ?= $(NXT_VERSION) VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
SRCDIR= unit-$(VERSION) SRCDIR= unit-$(VERSION)

3
pkg/docker/Makefile
View File

@@ -3,9 +3,10 @@
include ../../version include ../../version
include ../shasum.mak include ../shasum.mak
DEFAULT_VERSION := $(NXT_VERSION)
DEFAULT_RELEASE := 1 DEFAULT_RELEASE := 1
VERSION ?= $(NXT_VERSION) VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
CODENAME := buster CODENAME := buster

3
pkg/rpm/Makefile
View File

@@ -2,9 +2,10 @@
include ../../version include ../../version
DEFAULT_VERSION := $(NXT_VERSION)
DEFAULT_RELEASE := 1 DEFAULT_RELEASE := 1
VERSION ?= $(NXT_VERSION) VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0)