summaryrefslogtreecommitdiffhomepage
path: root/pkg/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/rpm')
-rw-r--r--pkg/rpm/Makefile13
-rw-r--r--pkg/rpm/Makefile.python272
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-go-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-php-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example-ruby-config2
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.example.config8
-rw-r--r--pkg/rpm/unit.module.spec.in2
-rw-r--r--pkg/rpm/unit.spec.in2
17 files changed, 32 insertions, 19 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index d94890f2..9e343aa2 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -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
diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
index 005eff17..95b392a9 100644
--- a/pkg/rpm/Makefile.python27
+++ b/pkg/rpm/Makefile.python27
@@ -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
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
index 079ce0b8..a2c91e80 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
@@ -9,7 +9,7 @@
"listeners": {
"*:8500": {
- "application": "example_go"
+ "pass": "applications/example_go"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config
index 6c1d9549..3f7dd518 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc11-config
@@ -9,7 +9,7 @@
"listeners": {
"*:8800": {
- "application": "example_java11"
+ "pass": "applications/example_java11"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config
index 0254677b..4d79112f 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-jsc8-config
@@ -9,7 +9,7 @@
"listeners": {
"*:8800": {
- "application": "example_java8"
+ "pass": "applications/example_java8"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config
index 0329b78a..031928ce 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8600": {
- "application": "example_perl"
+ "pass": "applications/example_perl"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-php-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-php-config
index 71564df3..8f23c984 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-php-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-php-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8300": {
- "application": "example_php"
+ "pass": "applications/example_php"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python-config
index 2866cc16..d612c89d 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config
index c8a876f5..7541fcb3 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config
index cab381e2..b64e570c 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config
index 23e0ea53..025f3428 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config
index 758dab25..825cabc4 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config
index ada7ae5b..7f5e52f1 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python37-config
@@ -11,7 +11,7 @@
"listeners": {
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-ruby-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-ruby-config
index 53eee534..15a92735 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-ruby-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-ruby-config
@@ -10,7 +10,7 @@
"listeners": {
"*:8700": {
- "application": "example_ruby"
+ "pass": "applications/example_ruby"
}
}
}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example.config b/pkg/rpm/rpmbuild/SOURCES/unit.example.config
index 1715c971..6fe35e2f 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example.config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example.config
@@ -33,19 +33,19 @@
"listeners": {
"*:8300": {
- "application": "example_php"
+ "pass": "applications/example_php"
},
"*:8400": {
- "application": "example_python"
+ "pass": "applications/example_python"
},
"*:8500": {
- "application": "example_go"
+ "pass": "applications/example_go"
},
"*:8600": {
- "application": "example_perl"
+ "pass": "applications/example_perl"
}
}
}
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index ab55d2a4..023ebfab 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -48,7 +48,7 @@ This package contains %%SUMMARY%%.
%debug_package
%endif
-%if 0%{?fedora}
+%if (0%{?fedora}) || (0%{?rhel} >= 8)
%define _debugsource_template %{nil}
%endif
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 2d5c1bd1..afd2f1ff 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -72,7 +72,7 @@ dynamically via an API.
%debug_package
%endif
-%if 0%{?fedora}
+%if (0%{?fedora}) || (0%{?rhel} >= 8)
%define _debugsource_template %{nil}
%endif
generated by cgit (git 2.34.1) at 2025-01-13 11:47:11 +0000