Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23094059 golang supplemental packages should be pre-built
authorShawn Walker-Salas <shawn.walker@oracle.com>
Tue, 12 Apr 2016 15:53:45 -0700
changeset 5780 42f59614ccbf
parent 5779 22149b3b3a47
child 5781 ecbdf40c0a37
23094059 golang supplemental packages should be pre-built
components/golang/Makefile file | annotate | diff | comparison | revisions
components/golang/crypto-15.p5m file | annotate | diff | comparison | revisions
components/golang/image-15.p5m file | annotate | diff | comparison | revisions
components/golang/lint-15.p5m file | annotate | diff | comparison | revisions
components/golang/net-15.p5m file | annotate | diff | comparison | revisions
components/golang/sys-15.p5m file | annotate | diff | comparison | revisions
components/golang/text-15.p5m file | annotate | diff | comparison | revisions
components/golang/tools-15.p5m file | annotate | diff | comparison | revisions
components/golang/tour-15.p5m file | annotate | diff | comparison | revisions 
--- a/components/golang/Makefile	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/Makefile	Tue Apr 12 15:53:45 2016 -0700
@@ -210,9 +210,13 @@
 # -z aslr=... option. So just override where needed in the .p5m files.
 ASLR_MODE = $(ASLR_DISABLE)
 
+# The timestamp is generated immediately once when the Makefile is evaluated to
+# ensure every package gets the same one.
+GOTS := $(shell date +"%Y%m%dT%H%M%SZ")
+
 # Make sure the source code and object files have identical timestamps so
 # the Go compiler doesn't try to rebuild them.
-PKG_MACROS += TIMESTAMP=$(shell date +"%Y%m%dT%H%M%SZ")
+PKG_MACROS += TIMESTAMP=$(GOTS)
 # Extra macros for packaging convenience.
 PKG_MACROS += COMPONENT_MAJOR_VERSION=$(COMPONENT_MAJOR_VERSION)
 # COMPONENT_MAJOR_VERSION suitable for use in regular expressions.
@@ -268,11 +272,6 @@
 endef
 
 $(foreach suffix,$(SUPP_PACKAGES), $(eval $(call install-rules,$(suffix))))
-
-# XXX For now, the install of supplementary packages is intentionally disabled
-# as the result cannot be used as expected due to an unknown issue with the Go
-# compilers.
-#
 # Install supplementary packages (this cannot be done one-by-one); install
 # tools/go/types first to avoid quirk with trimpath and dependencies.  This is
 # technically a build and install, but go's build command won't "install"
@@ -280,18 +279,21 @@
 # directory.
 #
 # The -trimpath option used here ensures that the paths recorded in the
-# pre-built packages are relative to the $(SUPP_ROOT) so that when a devleoper
-# sets their GOPATH to that directory, things work as expected.
-#COMPONENT_POST_INSTALL_ACTION += \
-#	($(ENV) $(COMPONENT_INSTALL_ENV) go install \
-#		-asmflags -trimpath=$(SUPP_ROOT) -gcflags -trimpath=$(SUPP_ROOT) \
-#		"golang.org/x/tools/go/types"; \
-#	$(ENV) $(COMPONENT_INSTALL_ENV) go install \
-#		-asmflags -trimpath=$(SUPP_ROOT) -gcflags -trimpath=$(SUPP_ROOT) \
-#		"golang.org/x/..."; \
-#	$(ENV) $(COMPONENT_INSTALL_ENV) go install \
-#		-asmflags -trimpath=$(SUPP_ROOT) -gcflags -trimpath=$(SUPP_ROOT) \
-#		"github.com/golang/...");
+# pre-built packages do not contain the containing directory; the result is a
+# path that Go will evaluate relative to $GOPATH and so will pass the "stale"
+# object checks that Go performs at build time allowing reuse of the pre-built
+# packages.
+PROTO_ROOT= $(SUPP_ROOT)
+COMPONENT_POST_INSTALL_ACTION += \
+	($(ENV) $(COMPONENT_INSTALL_ENV) go install \
+		-asmflags -trimpath=$(PROTO_ROOT) -gcflags -trimpath=$(PROTO_ROOT) \
+		"golang.org/x/tools/go/types"; \
+	$(ENV) $(COMPONENT_INSTALL_ENV) go install \
+		-asmflags -trimpath=$(PROTO_ROOT) -gcflags -trimpath=$(PROTO_ROOT) \
+		"golang.org/x/..."; \
+	$(ENV) $(COMPONENT_INSTALL_ENV) go install \
+		-asmflags -trimpath=$(PROTO_ROOT) -gcflags -trimpath=$(PROTO_ROOT) \
+		"github.com/golang/...");
 
 # Go's test suite is currently designed to be run from the build area.
 
--- a/components/golang/crypto-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/crypto-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -35,6 +35,39 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/bcrypt.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/blowfish.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/bn256.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/cast5.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/curve25519.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/hkdf.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/md4.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/nacl/box.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/nacl/secretbox.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ocsp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/armor.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/clearsign.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/elgamal.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/errors.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/packet.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/openpgp/s2k.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/otr.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/pbkdf2.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/poly1305.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ripemd160.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/salsa20.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/salsa20/salsa.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/scrypt.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/sha3.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ssh.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ssh/agent.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ssh/terminal.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/ssh/test.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/tea.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/twofish.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/xtea.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/crypto/xts.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/crypto/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/crypto/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/crypto/CONTRIBUTORS
--- a/components/golang/image-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/image-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -35,6 +35,22 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/bmp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/colornames.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/draw.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/font.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/font/basicfont.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/font/plan9font.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/math/f32.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/math/f64.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/math/fixed.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/riff.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/tiff.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/tiff/lzw.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/vp8.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/vp8l.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/webp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/image/webp/nycbcra.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/image/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/image/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/image/CONTRIBUTORS
--- a/components/golang/lint-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/lint-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -36,6 +36,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/golint \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/golint
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/golint
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/github.com/golang/lint.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/github.com/golang/lint/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/github.com/golang/lint/LICENSE
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/github.com/golang/lint/README.md
--- a/components/golang/net-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/net-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -35,6 +35,28 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/context.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/context/ctxhttp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/dict.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/html.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/html/atom.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/html/charset.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/http2.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/http2/hpack.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/icmp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/idna.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/internal/iana.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/internal/nettest.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/internal/timeseries.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/ipv4.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/ipv6.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/netutil.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/proxy.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/publicsuffix.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/trace.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/webdav.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/webdav/internal/xml.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/net/websocket.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/net/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/net/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/net/CONTRIBUTORS
--- a/components/golang/sys-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/sys-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -35,6 +35,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/sys/plan9.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/sys/unix.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/sys/windows.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/sys/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/sys/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/sys/CONTRIBUTORS
--- a/components/golang/text-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/text-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -35,6 +35,42 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/colcmp
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/cases.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/cldr.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/collate.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/collate/build.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/collate/colltab.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/currency.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/display.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/charmap.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/htmlindex.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/ianaindex.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/internal.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/internal/identifier.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/japanese.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/korean.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/simplifiedchinese.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/traditionalchinese.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/encoding/unicode.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/colltab.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/format.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/gen.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/tag.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/testtext.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/triegen.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/internal/ucd.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/language.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/message.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/runes.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/search.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/transform.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/unicode/norm.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/unicode/rangetable.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/text/width.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/text/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/text/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/text/CONTRIBUTORS
--- a/components/golang/tools-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/tools-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -36,6 +36,81 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/godex \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/godex
+link path=usr/bin/godoc \
+    target=../lib/golang/$(COMPONENT_MAJOR_VERSION)/bin/godoc
+link path=usr/bin/goimports \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/goimports
+link path=usr/bin/gomvpkg \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gomvpkg
+link path=usr/bin/gorename \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gorename
+link path=usr/bin/gotype \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gotype
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/benchcmp
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/callgraph
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/cover
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/digraph
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/eg
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/fiximports
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/godex
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/goimports
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gomvpkg
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gorename
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gotype
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/html2article
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/oracle
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/present
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/ssadump
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/stress
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/stringer
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/tip
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/vet
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/benchmark/parse.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/blog.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/blog/atom.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/cmd/vet/whitelist.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/container/intsets.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/cover.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/ast/astutil.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/buildutil.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/callgraph.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/callgraph/cha.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/callgraph/rta.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/callgraph/static.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/exact.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/gccgoimporter.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/gcimporter.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/importer.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/loader.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/pointer.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/ssa.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/ssa/interp.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/ssa/ssautil.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/types.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/types/typeutil.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/go/vcs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/analysis.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/redirect.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/static.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/util.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/vfs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/vfs/gatefs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/vfs/httpfs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/vfs/mapfs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/godoc/vfs/zipfs.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/imports.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/oracle.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/oracle/serial.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/playground.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/playground/socket.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/present.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/refactor/eg.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/refactor/importgraph.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/refactor/rename.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tools/refactor/satisfy.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/CONTRIBUTORS
@@ -690,4 +765,5 @@
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/refactor/rename/spec.go
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/refactor/rename/util.go
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tools/refactor/satisfy/find.go
+file path=usr/lib/golang/$(COMPONENT_MAJOR_VERSION)/bin/godoc
 license license.tools license="BSD-style, Patent Grant"
--- a/components/golang/tour-15.p5m	Thu Apr 14 21:50:55 2016 -0700
+++ b/components/golang/tour-15.p5m	Tue Apr 12 15:53:45 2016 -0700
@@ -36,6 +36,14 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=$(ARC_CASE)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/gotour \
+    target=../lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gotour
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/gotour
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/bin/moretypes
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tour/pic.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tour/reader.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tour/tree.a
+file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/pkg/solaris_amd64/golang.org/x/tour/wc.a
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tour/AUTHORS
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tour/CONTRIBUTING.md
 file path=usr/lib/gocode/$(COMPONENT_MAJOR_VERSION)/src/golang.org/x/tour/CONTRIBUTORS
upstream/oracle/userland-gate