move vendor directory directly under packages

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2025-07-30 05:51:26 +00:00 · 2016-09-10 17:20:32 +01:00 · 2016-09-10 17:20:32 +01:00 · 28afc72a97
commit 28afc72a97
parent 01ad4e5e39
44 changed files with 5 additions and 5 deletions
--- a/alpine/packages/diagnostics/Makefile
+++ b/alpine/packages/diagnostics/Makefile
@ -3,7 +3,7 @@ all: diagnostics-server
 .PHONY: vendor
 vendor:
 	mkdir -p ./vendor
-	cp -r ../go/vendor/* ./vendor/
+	cp -r ../vendor/* ./vendor/

 diagnostics-server: Dockerfile main.go vendor
 	docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t diagnostics:build .
--- a/alpine/packages/proxy/Makefile
+++ b/alpine/packages/proxy/Makefile
@ -3,10 +3,10 @@ all: proxy
 files:
 	ls Dockerfile *.go > files
 	find libproxy >> files
-	printf -- '-C\n../go\n' >> files
-	(cd ../go && find vendor) >> files
+	printf -- '-C\n..\n' >> files
+	(cd .. && find vendor) >> files

-proxy: Dockerfile $(wildcard *.go libproxy/*.go) ../go/vendor/manifest files
+proxy: Dockerfile $(wildcard *.go libproxy/*.go) ../vendor/manifest files
 	tar cf - -T files | docker build -t proxy:build -
 	docker run --rm proxy:build | tar xf -

--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.gitignore
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.gitignore
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.travis.yml
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.travis.yml
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/LICENSE
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/LICENSE
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/README.md
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/README.md
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/doc.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/doc.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/entry.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/entry.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/exported.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/exported.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatter.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatter.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/json_formatter.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/json_formatter.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logger.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logger.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logrus.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logrus.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_linux.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_linux.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_windows.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_windows.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/text_formatter.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/text_formatter.go
--- a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/writer.go
+++ b/alpine/packages/go/vendor/github.com/Sirupsen/logrus/writer.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/LICENSE
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/LICENSE
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/client.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/client.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go
--- a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go
+++ b/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go
--- a/alpine/packages/go/vendor/manifest
+++ b/alpine/packages/go/vendor/manifest
--- a/alpine/packages/vsudd/Makefile
+++ b/alpine/packages/vsudd/Makefile
@ -3,7 +3,7 @@ all: vsudd
 .PHONY: vendor
 vendor:
 	mkdir -p ./vendor
-	cp -r ../go/vendor/* ./vendor/
+	cp -r ../vendor/* ./vendor/

 vsudd: Dockerfile main.go vendor
 	docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t vsudd:build .