From a19cf28c267641e946f5a4935ec496bdeab2c219 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 15 Dec 2020 16:15:40 +1100 Subject: [PATCH] agent/protocols: Remove some unnecessary include directives from protoc The generate_go_sources() function in update-generate-proto.sh adds a number of include directives to the protoc command line. Some of these don't appear to be necessary to correctly compile the agent's protocol files, so remove them. Amongst other things were directives pointing at the old Kata1 runtime and agent repositories. Those ones could be actively harmful by causing odd dependencies of the Kata2 build on the Kata1 repositories. Signed-off-by: David Gibson --- src/agent/protocols/hack/update-generated-proto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/protocols/hack/update-generated-proto.sh b/src/agent/protocols/hack/update-generated-proto.sh index 7abe973c6c..cfc66415c6 100755 --- a/src/agent/protocols/hack/update-generated-proto.sh +++ b/src/agent/protocols/hack/update-generated-proto.sh @@ -47,7 +47,7 @@ show_usage() { } generate_go_sources() { - local cmd="protoc -I$GOPATH/src/github.com/kata-containers/agent/vendor/github.com/gogo/protobuf:$GOPATH/src/github.com/kata-containers/agent/vendor:$GOPATH/src/github.com/gogo/protobuf:$GOPATH/src/github.com/gogo/googleapis:$GOPATH/src:$GOPATH/src/github.com/kata-containers/kata-containers/src/agent/protocols/protos \ + local cmd="protoc -I$GOPATH/src:$GOPATH/src/github.com/kata-containers/kata-containers/src/agent/protocols/protos \ --gogottrpc_out=plugins=ttrpc+fieldpath,\ import_path=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\ \