diff options
author | Max Romanov <max.romanov@nginx.com> | 2017-12-01 16:59:41 +0300 |
---|---|---|
committer | Max Romanov <max.romanov@nginx.com> | 2017-12-01 16:59:41 +0300 |
commit | cdf900cf2c98b4e3fad11e8b69cd2135f2c306c7 (patch) | |
tree | da2ed9180008803fcc0500c28191d8c2643df891 /pkg/deb/Makefile.go17 | |
parent | 40eb1f8b9b2a76d76ef6a4a094bf8192a44cbe41 (diff) | |
download | unit-cdf900cf2c98b4e3fad11e8b69cd2135f2c306c7.tar.gz unit-cdf900cf2c98b4e3fad11e8b69cd2135f2c306c7.tar.bz2 |
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.
Diffstat (limited to 'pkg/deb/Makefile.go17')
-rw-r--r-- | pkg/deb/Makefile.go17 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17 index 7fbfd360..8c2ee1b2 100644 --- a/pkg/deb/Makefile.go17 +++ b/pkg/deb/Makefile.go17 @@ -6,7 +6,7 @@ MODULE_SUMMARY_go17= Go 1.7 module for NGINX Unit MODULE_VERSION_go17= $(VERSION) MODULE_RELEASE_go17= 1 -MODULE_CONFARGS_go17= go --go=/usr/lib/go-1.7/bin/go --go-path=\$$(GOROOT) +MODULE_CONFARGS_go17= go --go=/usr/lib/go-1.7/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go17= /usr/lib/go-1.7/bin/go MODULE_INSTARGS_go17= /usr/lib/go-1.7/bin/go-install @@ -15,13 +15,10 @@ MODULE_SOURCES_go17= unit.example-go-app \ BUILD_DEPENDS+= golang-1.7 -MODULE_BUILD_DEPENDS_go=,golang-1.7 -MODULE_DEPENDS_go=,golang-1.7 +MODULE_BUILD_DEPENDS_go17=,golang-1.7 +MODULE_DEPENDS_go17=,golang-1.7 -define MODULE_DEFINITIONS_go17 -GOROOT = \$$(shell /usr/lib/go-1.7/bin/go env GOROOT) -endef -export MODULE_DEFINITIONS_go17 +MODULE_NOARCH_go17= true define MODULE_PREINSTALL_go17 mkdir -p debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app @@ -38,7 +35,7 @@ The $(MODULE_SUMMARY_go17) has been installed. To check out the sample app, run these commands: - /usr/lib/go-1.7/bin/go build -o /tmp/go1.7-app /usr/share/doc/unit-go1.7/examples/go-app/let-my-people.go + GOPATH=/usr/share/gocode /usr/lib/go-1.7/bin/go build -o /tmp/go1.7-app /usr/share/doc/unit-go1.7/examples/go-app/let-my-people.go sudo service unit restart sudo service unit loadconfig /usr/share/doc/unit-go1.7/examples/unit.config curl http://localhost:8500/ |