Packaging changes for updated Go package.

- package name changed to 'nginx/unit';
- source files installed in /usr/share/gocode;
- rpm and deb go packages made noarch.
This commit is contained in:
Max Romanov
2017-12-01 16:59:41 +03:00
parent 40eb1f8b9b
commit cdf900cf2c
10 changed files with 140 additions and 36 deletions

View File

@@ -5,7 +5,7 @@ MODULE_SUMMARY_go= Go module for NGINX Unit
MODULE_VERSION_go= $(VERSION)
MODULE_RELEASE_go= 1
MODULE_CONFARGS_go= go --go-path=%{goroot}
MODULE_CONFARGS_go= go --go-path=%{gopath}
MODULE_MAKEARGS_go= go
MODULE_INSTARGS_go= go-install
@@ -15,11 +15,9 @@ MODULE_SOURCES_go= unit.example-go-app \
BUILD_DEPENDS+= golang
define MODULE_DEFINITIONS_go
%define goroot %(go env GOROOT)
%define goos %(go env GOOS)
%define goarch %(go env GOARCH)
BuildRequires: golang
BuildArch: noarch
endef
export MODULE_DEFINITIONS_go
@@ -36,9 +34,8 @@ endef
export MODULE_PREINSTALL_go
define MODULE_FILES_go
%dir %{goroot}/src/unit
%{goroot}/src/unit/*
%{goroot}/pkg/%{goos}_%{goarch}/unit.a
%dir %{gopath}/src/nginx/unit
%{gopath}/src/nginx/unit/*
endef
export MODULE_FILES_go
@@ -50,7 +47,7 @@ The $(MODULE_SUMMARY_go) has been installed.
To check the sample app, run these commands:
go build -o /tmp/go-app /usr/share/doc/unit-go/examples/go-app/let-my-people.go
GOPATH=/usr/share/gocode go build -o /tmp/go-app /usr/share/doc/unit-go/examples/go-app/let-my-people.go
sudo service unit start
sudo service unit loadconfig /usr/share/doc/unit-go/examples/unit.config
curl http://localhost:8500/

View File

@@ -3,7 +3,7 @@ package main
import (
"fmt"
"net/http"
"unit"
"nginx/unit"
)
func handler(w http.ResponseWriter, r *http.Request) {