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

Packages: Added Fedora 39 support.

Browse Source
This commit is contained in:
Konstantin Pavlov
2023-11-17 16:29:18 -08:00
committed by Konstantin Pavlov
parent ca1bc0625a
commit bad2c181e1
5 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/rpm/Makefile
View File

@@ -22,8 +22,10 @@ else ifeq ($(shell rpm --eval "%{?amzn}"), 2023)
OSVER = amazonlinux2023
else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35 -a 0%{?fedora} -le 36'`; echo $$?),0)
OSVER = fedora
else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 37'`; echo $$?),0)
else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 37 -a 0%{?fedora} -le 38'`; echo $$?),0)
OSVER = fedora37
else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 39'`; echo $$?),0)
OSVER = fedora39
endif
BUILD_DEPENDS_unit = gcc rpm-build rpmlint
@@ -124,6 +126,18 @@ include Makefile.jsc11
include Makefile.wasm
endif
ifeq ($(OSVER), fedora39)
include Makefile.php
include Makefile.python312
include Makefile.go
include Makefile.perl
include Makefile.ruby
include Makefile.jsc-common
include Makefile.jsc17
include Makefile.wasm
endif
CONFIGURE_ARGS_COMMON=\
--prefix=/usr \
--statedir=%{_sharedstatedir}/unit \

5
pkg/rpm/Makefile.jsc-common
View File

@@ -10,16 +10,19 @@ JAVA_ARCH_jsc_common= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>
ifeq ($(OSVER),amazonlinux2023)
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-17-amazon-corretto --lib-path=/usr/lib/jvm/java-17-amazon-corretto/lib --jars=/usr/share/unit-jsc-common/
else ifeq ($(OSVER),fedora39)
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-17-openjdk --lib-path=/usr/lib/jvm/java-17-openjdk/lib --jars=/usr/share/unit-jsc-common/
else
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-1.8.0 --lib-path=/usr/lib/jvm/jre-1.8.0/lib/$(JAVA_ARCH_jsc_common) --jars=/usr/share/unit-jsc-common/
endif
MODULE_MAKEARGS_jsc_common= java
MODULE_INSTARGS_jsc_common= java-shared-install
MODULE_SOURCES_jsc_common= COPYRIGHT.unit-jsc-common
ifeq ($(OSVER),amazonlinux2023)
BUILD_DEPENDS_jsc_common= java-17-amazon-corretto-devel curl
else ifeq ($(OSVER),fedora39)
BUILD_DEPENDS_jsc_common= java-17-openjdk-devel curl
else
BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl
endif

13
pkg/rpm/Makefile.jsc17
View File

@@ -6,19 +6,32 @@ MODULE_SUMMARY_jsc17= Java 17 module for NGINX Unit
MODULE_VERSION_jsc17= $(VERSION)
MODULE_RELEASE_jsc17= 1
ifeq ($(OSVER),amazonlinux2023)
MODULE_CONFARGS_jsc17= java --module=java17 --home=/usr/lib/jvm/java-17-amazon-corretto --lib-path=/usr/lib/jvm/java-17-amazon-corretto/lib --jars=/usr/share/unit-jsc-common/
else ifeq ($(OSVER),fedora39)
MODULE_CONFARGS_jsc17= java --module=java17 --home=/usr/lib/jvm/java-17-openjdk --lib-path=/usr/lib/jvm/java-17-openjdk/lib --jars=/usr/share/unit-jsc-common/
endif
MODULE_MAKEARGS_jsc17= java17
MODULE_INSTARGS_jsc17= java17-install
MODULE_SOURCES_jsc17= unit.example-jsc-app \
unit.example-jsc17-config
ifeq ($(OSVER),amazonlinux2023)
BUILD_DEPENDS_jsc17= java-17-amazon-corretto-devel
else ifeq ($(OSVER),fedora39)
BUILD_DEPENDS_jsc17= java-17-openjdk-devel
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc17)
endif
define MODULE_DEFINITIONS_jsc17
Requires: unit-jsc-common == $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)%{?dist}.ngx
%if (0%{?amzn} == 2023)
Requires: java-17-amazon-corretto-headless
%endif
%if (0%{?fedora} >= 39)
Requires: java-17-openjdk-headless
%endif
endef
export MODULE_DEFINITIONS_jsc17

53
pkg/rpm/Makefile.python312 Normal file
View File

@@ -0,0 +1,53 @@
MODULES+= python312
MODULE_SUFFIX_python312= python3.12
MODULE_SUMMARY_python312= Python 3.12 module for NGINX Unit
MODULE_VERSION_python312= $(VERSION)
MODULE_RELEASE_python312= 1
MODULE_CONFARGS_python312= python --config=python3.12-config
MODULE_MAKEARGS_python312= python3.12
MODULE_INSTARGS_python312= python3.12-install
MODULE_SOURCES_python312= unit.example-python-app \
unit.example-python312-config
BUILD_DEPENDS_python312= python3-devel
BUILD_DEPENDS+= $(BUILD_DEPENDS_python312)
define MODULE_PREINSTALL_python312
%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python312/examples/python-app
%{__install} -m 644 -p %{SOURCE100} \
%{buildroot}%{_datadir}/doc/unit-python312/examples/python-app/wsgi.py
%{__install} -m 644 -p %{SOURCE101} \
%{buildroot}%{_datadir}/doc/unit-python312/examples/unit.config
endef
export MODULE_PREINSTALL_python312
define MODULE_FILES_python312
%{_libdir}/unit/modules/*
%{_libdir}/unit/debug-modules/*
endef
export MODULE_FILES_python312
define MODULE_POST_python312
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_python312) has been installed.
To check the sample app, run these commands:
sudo service unit start
cd /usr/share/doc/%{name}/examples
sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config
curl http://localhost:8400/
Online documentation is available at https://unit.nginx.org
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_python312

16
pkg/rpm/rpmbuild/SOURCES/unit.example-python312-config Normal file
View File

@@ -0,0 +1,16 @@
{
"applications": {
"example_python": {
"type": "python 3.12",
"processes": 2,
"path": "/usr/share/doc/unit-python3.12/examples/python-app",
"module": "wsgi"
}
},
"listeners": {
"*:8400": {
"pass": "applications/example_python"
}
}
}