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

Packages: added RHEL 8 support.

Browse Source
This commit is contained in:
Andrei Belov
2019-03-26 13:22:59 +03:00
parent b96e5fd848
commit 3d7a47c9ac
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/rpm/Makefile
View File

@@ -11,6 +11,8 @@ ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?),
OSVER = centos6
else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
OSVER = centos7
else ifeq ($(shell rpm --eval "%{?rhel}"), 8)
OSVER = centos8
else ifeq ($(shell rpm --eval "%{?amzn}"), 1)
OSVER = amazonlinux1
else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
@@ -63,6 +65,17 @@ include Makefile.jsc8
include Makefile.jsc11
endif
ifeq ($(OSVER), centos8)
include Makefile.php
include Makefile.python27
include Makefile.python36
include Makefile.go
include Makefile.perl
include Makefile.jsc-common
include Makefile.jsc8
include Makefile.jsc11
endif
ifeq ($(OSVER), amazonlinux1)
include Makefile.php
include Makefile.python27

2
pkg/rpm/Makefile.python27
View File

@@ -15,7 +15,7 @@ MODULE_SOURCES_python27= unit.example-python-app \
ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles))
BUILD_DEPENDS_python27= python-devel
else ifeq ($(OSVER), fedora)
else ifneq (,$(findstring $(OSVER),fedora centos8))
BUILD_DEPENDS_python27= python2-devel
else
BUILD_DEPENDS_python27= python27-devel

2
pkg/rpm/unit.module.spec.in
View File

@@ -44,7 +44,7 @@ This package contains %%SUMMARY%%.
%debug_package
%endif
%if 0%{?fedora}
%if (0%{?fedora}) || (0%{?rhel} >= 8)
%define _debugsource_template %{nil}
%endif

2
pkg/rpm/unit.spec.in
View File

@@ -67,7 +67,7 @@ dynamically via an API.
%debug_package
%endif
%if 0%{?fedora}
%if (0%{?fedora}) || (0%{?rhel} >= 8)
%define _debugsource_template %{nil}
%endif