Packages: added Ubuntu 19.10 "eoan" support.

This commit is contained in:
Andrei Belov
2019-11-21 14:13:24 +03:00
parent bc14605fd6
commit 5758a06374
8 changed files with 168 additions and 1 deletions

View File

@@ -11,6 +11,7 @@ PACKAGES= unit \
unit-python3.5 unit-python3.6 unit-python3.7 \ unit-python3.5 unit-python3.6 unit-python3.7 \
unit-python3.8 \ unit-python3.8 \
unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10 \ unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10 \
unit-go1.12 unit-go1.13 \
unit-perl \ unit-perl \
unit-ruby \ unit-ruby \
unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11

View File

@@ -5,6 +5,32 @@
<change_log title="unit"> <change_log title="unit">
<changes apply="unit-go1.13" ver="1.13.0" rev="1"
date="2019-11-20" time="09:00:00 +0300"
packager="Andrei Belov &lt;defan@nginx.com&gt;">
<change>
<para>
Initial release of Go 1.13 module for NGINX Unit.
</para>
</change>
</changes>
<changes apply="unit-go1.12" ver="1.13.0" rev="1"
date="2019-11-20" time="09:00:00 +0300"
packager="Andrei Belov &lt;defan@nginx.com&gt;">
<change>
<para>
Initial release of Go 1.12 module for NGINX Unit.
</para>
</change>
</changes>
<changes apply="unit-python3.8" ver="1.13.0" rev="1" <changes apply="unit-python3.8" ver="1.13.0" rev="1"
date="2019-11-18" time="14:20:00 +0300" date="2019-11-18" time="14:20:00 +0300"
packager="Andrei Belov &lt;defan@nginx.com&gt;"> packager="Andrei Belov &lt;defan@nginx.com&gt;">

View File

@@ -16,6 +16,20 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
MODULES= MODULES=
# Ubuntu 19.10
ifeq ($(CODENAME),eoan)
include Makefile.php
include Makefile.python27
include Makefile.python37
include Makefile.python38
include Makefile.go112
include Makefile.go113
include Makefile.perl
include Makefile.ruby
include Makefile.jsc-common
include Makefile.jsc11
endif
# Ubuntu 19.04 # Ubuntu 19.04
ifeq ($(CODENAME),disco) ifeq ($(CODENAME),disco)
include Makefile.php include Makefile.php

48
pkg/deb/Makefile.go112 Normal file
View File

@@ -0,0 +1,48 @@
MODULES+= go112
MODULE_SUFFIX_go112= go1.12
MODULE_SUMMARY_go112= Go 1.12 module for NGINX Unit
MODULE_VERSION_go112= $(VERSION)
MODULE_RELEASE_go112= 1
MODULE_CONFARGS_go112= go --go=/usr/lib/go-1.12/bin/go --go-path=/usr/share/gocode
MODULE_MAKEARGS_go112= /usr/lib/go-1.12/bin/go
MODULE_INSTARGS_go112= /usr/lib/go-1.12/bin/go-install
MODULE_SOURCES_go112= unit.example-go-app \
unit.example-go1.12-config
BUILD_DEPENDS_go112= golang-1.12
BUILD_DEPENDS+= $(BUILD_DEPENDS_go112)
MODULE_BUILD_DEPENDS_go112=,golang-1.12
MODULE_DEPENDS_go112=,golang-1.12
define MODULE_PREINSTALL_go112
mkdir -p debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app
install -m 644 -p debian/unit.example-go-app debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app/let-my-people.go
install -m 644 -p debian/unit.example-go1.12-config debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/unit.config
endef
export MODULE_PREINSTALL_go112
define MODULE_POST_go112
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_go112) has been installed.
To check out the sample app, run these commands:
GOPATH=/usr/share/gocode /usr/lib/go-1.12/bin/go build -o /tmp/go1.12-app /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples/go-app/let-my-people.go
sudo service unit restart
cd /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples
sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
curl http://localhost:8500/
Online documentation is available at https://unit.nginx.org
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_go112

48
pkg/deb/Makefile.go113 Normal file
View File

@@ -0,0 +1,48 @@
MODULES+= go113
MODULE_SUFFIX_go113= go1.13
MODULE_SUMMARY_go113= Go 1.13 module for NGINX Unit
MODULE_VERSION_go113= $(VERSION)
MODULE_RELEASE_go113= 1
MODULE_CONFARGS_go113= go --go=/usr/lib/go-1.13/bin/go --go-path=/usr/share/gocode
MODULE_MAKEARGS_go113= /usr/lib/go-1.13/bin/go
MODULE_INSTARGS_go113= /usr/lib/go-1.13/bin/go-install
MODULE_SOURCES_go113= unit.example-go-app \
unit.example-go1.13-config
BUILD_DEPENDS_go113= golang-1.13
BUILD_DEPENDS+= $(BUILD_DEPENDS_go113)
MODULE_BUILD_DEPENDS_go113=,golang-1.13
MODULE_DEPENDS_go113=,golang-1.13
define MODULE_PREINSTALL_go113
mkdir -p debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app
install -m 644 -p debian/unit.example-go-app debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app/let-my-people.go
install -m 644 -p debian/unit.example-go1.13-config debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/unit.config
endef
export MODULE_PREINSTALL_go113
define MODULE_POST_go113
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_go113) has been installed.
To check out the sample app, run these commands:
GOPATH=/usr/share/gocode /usr/lib/go-1.13/bin/go build -o /tmp/go1.13-app /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples/go-app/let-my-people.go
sudo service unit restart
cd /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples
sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
curl http://localhost:8500/
Online documentation is available at https://unit.nginx.org
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_go113

View File

@@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit
MODULE_VERSION_jsc_common= $(VERSION) MODULE_VERSION_jsc_common= $(VERSION)
MODULE_RELEASE_jsc_common= 1 MODULE_RELEASE_jsc_common= 1
ifneq (,$(findstring $(CODENAME),disco buster)) ifneq (,$(findstring $(CODENAME),eoan disco buster))
JAVA_MINVERSION= 11 JAVA_MINVERSION= 11
else else
JAVA_MINVERSION= 8 JAVA_MINVERSION= 8

View File

@@ -0,0 +1,15 @@
{
"applications": {
"example_go": {
"type": "external",
"user": "nobody",
"executable": "/tmp/go1.12-app"
}
},
"listeners": {
"*:8500": {
"pass": "applications/example_go"
}
}
}

View File

@@ -0,0 +1,15 @@
{
"applications": {
"example_go": {
"type": "external",
"user": "nobody",
"executable": "/tmp/go1.13-app"
}
},
"listeners": {
"*:8500": {
"pass": "applications/example_go"
}
}
}