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.

4 files changed, 16 insertions, 25 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index fb31ad2b..6fdb667d 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -144,7 +144,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml
 		> $@/$(SRCDIR)/debian/changelog
 	cp debian/copyright debuild-$*/$(SRCDIR)/debian/
 	@{ \
-	set -e ;  \
+	set -e ; \
 	for src in $(MODULE_SOURCES_$*); do \
 		cp debian.module/$${src} $@/$(SRCDIR)/debian/ ; \
 	done ; \
@@ -152,7 +152,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml
 	prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
 	preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
 	post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
-	cat debian.module/control.in | sed \
+	cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \
                 -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \
                 -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \
                 -e "s#%%CODENAME%%#$(CODENAME)#g" \
@@ -163,7 +163,7 @@ debuild-%: debuild/unit_$(VERSION).orig.tar.gz ../../docs/changes.xml
                 -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \
                 -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \
         > $@/$(SRCDIR)/debian/control ; \
-        cat debian.module/rules.in | sed \
+        cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \
                 -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \
                 -e "s#%%CODENAME%%#$(CODENAME)#g" \
                 -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go
index d960a68d..53ed6b4c 100644
--- a/pkg/deb/Makefile.go
+++ b/pkg/deb/Makefile.go
@@ -6,7 +6,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=/usr/share/gocode
 MODULE_MAKEARGS_go=	go
 MODULE_INSTARGS_go=	go-install
 
@@ -18,10 +18,7 @@ BUILD_DEPENDS+=		golang
 MODULE_BUILD_DEPENDS_go=,golang
 MODULE_DEPENDS_go=,golang
 
-define MODULE_DEFINITIONS_go
-GOROOT = $(shell go env GOROOT)
-endef
-export MODULE_DEFINITIONS_go
+MODULE_NOARCH_go=	true
 
 define MODULE_PREINSTALL_go
 	mkdir -p debian/unit-go/usr/share/doc/unit-go/examples/go-app
@@ -38,7 +35,7 @@ The $(MODULE_SUMMARY_go) has been installed.
 
 To check out 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 restart
  sudo service unit loadconfig /usr/share/doc/unit-go/examples/unit.config
  curl http://localhost:8500/
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/
diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18
index 4f15bbc9..2f427da4 100644
--- a/pkg/deb/Makefile.go18
+++ b/pkg/deb/Makefile.go18
@@ -6,7 +6,7 @@ MODULE_SUMMARY_go18=	Go 1.8 module for NGINX Unit
 MODULE_VERSION_go18=	$(VERSION)
 MODULE_RELEASE_go18=	1
 
-MODULE_CONFARGS_go18=	go --go=/usr/lib/go-1.8/bin/go --go-path=\$$(GOROOT)
+MODULE_CONFARGS_go18=	go --go=/usr/lib/go-1.8/bin/go --go-path=/usr/share/gocode
 MODULE_MAKEARGS_go18=	/usr/lib/go-1.8/bin/go
 MODULE_INSTARGS_go18=	/usr/lib/go-1.8/bin/go-install
 
@@ -15,13 +15,10 @@ MODULE_SOURCES_go18=	unit.example-go-app \
 
 BUILD_DEPENDS+=		golang-1.8
 
-MODULE_BUILD_DEPENDS_go=,golang-1.8
-MODULE_DEPENDS_go=,golang-1.8
+MODULE_BUILD_DEPENDS_go18=,golang-1.8
+MODULE_DEPENDS_go18=,golang-1.8
 
-define MODULE_DEFINITIONS_go18
-GOROOT = \$$(shell /usr/lib/go-1.8/bin/go env GOROOT)
-endef
-export MODULE_DEFINITIONS_go18
+MODULE_NOARCH_go18=	true
 
 define MODULE_PREINSTALL_go18
 	mkdir -p debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app
@@ -38,7 +35,7 @@ The $(MODULE_SUMMARY_go18) has been installed.
 
 To check out the sample app, run these commands:
 
- /usr/lib/go-1.8/bin/go build -o /tmp/go1.8-app /usr/share/doc/unit-go1.8/examples/go-app/let-my-people.go
+ GOPATH=/usr/share/gocode /usr/lib/go-1.8/bin/go build -o /tmp/go1.8-app /usr/share/doc/unit-go1.8/examples/go-app/let-my-people.go
  sudo service unit restart
  sudo service unit loadconfig /usr/share/doc/unit-go1.8/examples/unit.config
  curl http://localhost:8500/