From: "Bruce Ashfield" <bruce.ashfield@gmail.com>
To: hongxu <hongxu.jia@windriver.com>
Cc: meta-virtualization@lists.yoctoproject.org
Subject: Re: [meta-virtualization][m-c-s][PATCH] consul: fix compile failure while go upgraded to 1.13
Date: Sun, 1 Dec 2019 23:08:53 -0500 [thread overview]
Message-ID: <20191202040852.GB27299@gmail.com> (raw)
In-Reply-To: <20191128065127.28275-1-hongxu.jia@windriver.com>
merged.
Bruce
In message: [meta-virtualization][m-c-s][PATCH] consul: fix compile failure while go upgraded to 1.13
on 27/11/2019 hongxu wrote:
> While go was upgraded to 1.13, there is a do_compile failure,
> Refer upstream envoyproxy to rename imports throughout
>
> https://github.com/envoyproxy/protoc-gen-validate/pull/161/commits/7428b5f8e7fdabbcc7c9710e23e6f438ba4ff021
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> recipes-connectivity/consul/consul_git.bb | 1 +
> ...-Migration-Rename-imports-throughout.patch | 82 +++++++++++++++++++
> 2 files changed, 83 insertions(+)
> create mode 100644 recipes-connectivity/consul/files/0001-Migration-Rename-imports-throughout.patch
>
> diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb
> index 566fbc9c..b96499c4 100644
> --- a/recipes-connectivity/consul/consul_git.bb
> +++ b/recipes-connectivity/consul/consul_git.bb
> @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul/LICENSE;md5=b278a92d2
> GO_IMPORT = "github.com/hashicorp/consul"
> SRCREV = "944cc71026c007e7de9467ec3f38f0ad14464fcc"
> SRC_URI = "git://${GO_IMPORT}.git \
> + file://0001-Migration-Rename-imports-throughout.patch \
> file://consul.service \
> "
>
> diff --git a/recipes-connectivity/consul/files/0001-Migration-Rename-imports-throughout.patch b/recipes-connectivity/consul/files/0001-Migration-Rename-imports-throughout.patch
> new file mode 100644
> index 00000000..906107da
> --- /dev/null
> +++ b/recipes-connectivity/consul/files/0001-Migration-Rename-imports-throughout.patch
> @@ -0,0 +1,82 @@
> +From a9353f184d6cf6ae7ef1b5676720f5bee0882ec3 Mon Sep 17 00:00:00 2001
> +From: Hongxu Jia <hongxu.jia@windriver.com>
> +Date: Wed, 27 Nov 2019 22:38:25 -0800
> +Subject: [PATCH] Migration: Rename imports throughout
> +
> +rename lyft -> envoyproxy
> +
> +Since upstream envoyproxy update it [https://github.com/envoyproxy/protoc-gen-validate/pull/161/commits/7428b5f8e7fdabbcc7c9710e23e6f438ba4ff021]
> +Upstream-Status: Pending
> +
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + .../envoy/api/v2/cluster/circuit_breaker.pb.go | 2 +-
> + .../go-control-plane/envoy/api/v2/route/route.pb.go | 4 ++--
> + .../envoyproxy/protoc-gen-validate/validate/validate.pb.go | 2 +-
> + .../envoyproxy/protoc-gen-validate/validate/validate.proto | 2 +-
> + 4 files changed, 5 insertions(+), 5 deletions(-)
> +
> +diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
> +index 30a138eba..7dfcc91e2 100644
> +--- a/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
> ++++ b/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster/circuit_breaker.pb.go
> +@@ -87,7 +87,7 @@ type CircuitBreakers_Thresholds struct {
> + // The :ref:`RoutingPriority<envoy_api_enum_core.RoutingPriority>`
> + // the specified CircuitBreaker settings apply to.
> + // [#comment:TODO(htuch): add (validate.rules).enum.defined_only = true once
> +- // https://github.com/lyft/protoc-gen-validate/issues/42 is resolved.]
> ++ // https://github.com/envoyproxy/protoc-gen-validate/issues/42 is resolved.]
> + Priority core.RoutingPriority `protobuf:"varint,1,opt,name=priority,proto3,enum=envoy.api.v2.core.RoutingPriority" json:"priority,omitempty"`
> + // The maximum number of connections that Envoy will make to the upstream
> + // cluster. If not specified, the default is 1024.
> +diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
> +index cce788c7d..ec69f4769 100644
> +--- a/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
> ++++ b/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/api/v2/route/route.pb.go
> +@@ -1513,7 +1513,7 @@ type RouteAction struct {
> + RequestMirrorPolicy *RouteAction_RequestMirrorPolicy `protobuf:"bytes,10,opt,name=request_mirror_policy,json=requestMirrorPolicy,proto3" json:"request_mirror_policy,omitempty"`
> + // Optionally specifies the :ref:`routing priority <arch_overview_http_routing_priority>`.
> + // [#comment:TODO(htuch): add (validate.rules).enum.defined_only = true once
> +- // https://github.com/lyft/protoc-gen-validate/issues/42 is resolved.]
> ++ // https://github.com/envoyproxy/protoc-gen-validate/issues/42 is resolved.]
> + Priority core.RoutingPriority `protobuf:"varint,11,opt,name=priority,proto3,enum=envoy.api.v2.core.RoutingPriority" json:"priority,omitempty"`
> + // Specifies a set of rate limit configurations that could be applied to the
> + // route.
> +@@ -3475,7 +3475,7 @@ type VirtualCluster struct {
> + // Optionally specifies the HTTP method to match on. For example GET, PUT,
> + // etc.
> + // [#comment:TODO(htuch): add (validate.rules).enum.defined_only = true once
> +- // https://github.com/lyft/protoc-gen-validate/issues/42 is resolved.]
> ++ // https://github.com/envoyproxy/protoc-gen-validate/issues/42 is resolved.]
> + Method core.RequestMethod `protobuf:"varint,3,opt,name=method,proto3,enum=envoy.api.v2.core.RequestMethod" json:"method,omitempty"`
> + XXX_NoUnkeyedLiteral struct{} `json:"-"`
> + XXX_unrecognized []byte `json:"-"`
> +diff --git a/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go b/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go
> +index ef5938c83..9a1a4c08d 100644
> +--- a/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go
> ++++ b/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.pb.go
> +@@ -1,7 +1,7 @@
> + // Code generated by protoc-gen-go. DO NOT EDIT.
> + // source: validate/validate.proto
> +
> +-package validate // import "github.com/lyft/protoc-gen-validate/validate"
> ++package validate // import "github.com/envoyproxy/protoc-gen-validate/validate"
> +
> + import proto "github.com/golang/protobuf/proto"
> + import fmt "fmt"
> +diff --git a/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto b/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto
> +index 1c5e04a16..05cce2cbd 100644
> +--- a/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto
> ++++ b/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto
> +@@ -1,7 +1,7 @@
> + syntax = "proto2";
> + package validate;
> +
> +-option go_package = "github.com/lyft/protoc-gen-validate/validate";
> ++option go_package = "github.com/envoyproxy/protoc-gen-validate/validate";
> + option java_package = "com.lyft.pgv.validate";
> +
> + import "google/protobuf/descriptor.proto";
> +--
> +2.21.0
> +
> --
> 2.21.0
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#4770): https://lists.yoctoproject.org/g/meta-virtualization/message/4770
> Mute This Topic: https://lists.yoctoproject.org/mt/63883590/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
prev parent reply other threads:[~2019-12-02 4:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 6:51 [meta-virtualization][m-c-s][PATCH] consul: fix compile failure while go upgraded to 1.13 hongxu
2019-12-02 4:08 ` Bruce Ashfield [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202040852.GB27299@gmail.com \
--to=bruce.ashfield@gmail.com \
--cc=hongxu.jia@windriver.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.