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

Packages: Added Amazon Linux 2023.

Browse Source
This commit is contained in:
Konstantin Pavlov
2023-03-22 16:55:36 -07:00
parent 700ee28bbf
commit 24243ecab3
6 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/rpm/Makefile
View File

@@ -18,6 +18,8 @@ else ifeq ($(shell rpm --eval "%{?rhel}"), 9)
OSVER = centos9
else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
OSVER = amazonlinux2
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)
@@ -84,6 +86,16 @@ include Makefile.jsc-common
include Makefile.jsc8
endif
ifeq ($(OSVER), amazonlinux2023)
include Makefile.php
include Makefile.python39
include Makefile.python311
include Makefile.go
include Makefile.perl
include Makefile.jsc-common
include Makefile.jsc17
endif
ifeq ($(OSVER), fedora)
include Makefile.php
include Makefile.python310

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

@@ -8,13 +8,21 @@ MODULE_RELEASE_jsc_common= 1
JAVA_ARCH_jsc_common= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>&1 | grep -F -e os.arch | sed -e 's/^.*= //')
ifneq (,$(findstring $(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
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
ifneq (,$(findstring $(OSVER),amazonlinux2023))
BUILD_DEPENDS_jsc_common= java-17-amazon-corretto-devel curl
else
BUILD_DEPENDS_jsc_common= java-1.8.0-openjdk-devel curl
endif
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common)
define MODULE_DEFINITIONS_jsc_common

70
pkg/rpm/Makefile.jsc17 Normal file
View File

@@ -0,0 +1,70 @@
MODULES+= jsc17
MODULE_SUFFIX_jsc17= jsc17
MODULE_SUMMARY_jsc17= Java 17 module for NGINX Unit
MODULE_VERSION_jsc17= $(VERSION)
MODULE_RELEASE_jsc17= 1
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/
MODULE_MAKEARGS_jsc17= java17
MODULE_INSTARGS_jsc17= java17-install
MODULE_SOURCES_jsc17= unit.example-jsc-app \
unit.example-jsc17-config
BUILD_DEPENDS_jsc17= java-17-amazon-corretto-devel
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc17)
define MODULE_DEFINITIONS_jsc17
Requires: unit-jsc-common == $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)%{?dist}.ngx
Requires: java-17-amazon-corretto-headless
endef
export MODULE_DEFINITIONS_jsc17
define MODULE_PREINSTALL_jsc17
%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-jsc17/examples/jsc-app
%{__install} -m 644 -p %{SOURCE100} \
%{buildroot}%{_datadir}/doc/unit-jsc17/examples/jsc-app/index.jsp
%{__install} -m 644 -p %{SOURCE101} \
%{buildroot}%{_datadir}/doc/unit-jsc17/examples/unit.config
%{__install} -m 644 -p %{bdir}/src/java/README.JSR-340 \
%{buildroot}%{_datadir}/doc/unit-jsc17/
endef
export MODULE_PREINSTALL_jsc17
define MODULE_POSTINSTALL_jsc17
DESTDIR=%{buildroot} make java-shared-uninstall
endef
export MODULE_POSTINSTALL_jsc17
define MODULE_FILES_jsc17
%{_libdir}/unit/modules/*
%{_libdir}/unit/debug-modules/*
%dir %{_datadir}/doc/unit-jsc17
%{_datadir}/doc/unit-jsc17/*
%{_datadir}/unit-jsc-common/*
endef
export MODULE_FILES_jsc17
define MODULE_POST_jsc17
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_jsc17) has been installed.
To check out the sample app, run these commands:
sudo service unit restart
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:8800/
Online documentation is available at https://unit.nginx.org
`cat /usr/share/doc/unit-jsc17/README.JSR-340`
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_jsc17

2
pkg/rpm/Makefile.python311
View File

@@ -15,6 +15,8 @@ MODULE_SOURCES_python311= unit.example-python-app \
ifneq (,$(findstring $(OSVER),fedora37))
BUILD_DEPENDS_python311= python3-devel
else
BUILD_DEPENDS_python311= python3.11-devel
endif
BUILD_DEPENDS+= $(BUILD_DEPENDS_python311)

2
pkg/rpm/Makefile.python39
View File

@@ -13,7 +13,7 @@ MODULE_INSTARGS_python39= python3.9-install
MODULE_SOURCES_python39= unit.example-python-app \
unit.example-python39-config
ifneq (,$(findstring $(OSVER),fedora amazonlinux2 centos9))
ifneq (,$(findstring $(OSVER),fedora amazonlinux2 amazonlinux2023 centos9))
BUILD_DEPENDS_python39= python3-devel
else
BUILD_DEPENDS_python39= python39-devel

15
pkg/rpm/rpmbuild/SOURCES/unit.example-jsc17-config Normal file
View File

@@ -0,0 +1,15 @@
{
"applications": {
"example_java17": {
"processes": 1,
"type": "java 17",
"webapp": "/usr/share/doc/unit-jsc17/examples/jsc-app"
}
},
"listeners": {
"*:8800": {
"pass": "applications/example_java17"
}
}
}