merged Bruce
On Thu, Mar 7, 2019 at 10:28 PM Hongzhi.Song <[email protected]> wrote: > > Uprev to v1.4.3 and remove invalid patch. > > Signed-off-by: Hongzhi.Song <[email protected]> > --- > recipes-connectivity/consul/consul_git.bb | 5 +-- > ...red_query-make-compatible-with-go1.5.patch | 31 ------------------- > 2 files changed, 3 insertions(+), 33 deletions(-) > delete mode 100644 > recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch > > diff --git a/recipes-connectivity/consul/consul_git.bb > b/recipes-connectivity/consul/consul_git.bb > index b0afa03..f9fb236 100644 > --- a/recipes-connectivity/consul/consul_git.bb > +++ b/recipes-connectivity/consul/consul_git.bb > @@ -4,14 +4,15 @@ LICENSE = "MPL-2.0 & BSD & Apache-2.0 & BSD-2-Clause & MIT" > LIC_FILES_CHKSUM = > "file://src/github.com/hashicorp/consul/LICENSE;md5=b278a92d2c1509760384428817710378" > > GO_IMPORT = "github.com/hashicorp/consul" > -SRCREV = "f97afda8e15046b41d951bf3b4220372c45df7ab" > +SRCREV = "567e41ff6b096a478333c804d5c18264050bc3f8" > SRC_URI = "git://${GO_IMPORT}.git \ > file://consul.service \ > - file://0001-prepared_query-make-compatible-with-go1.5.patch \ > " > > S = "${WORKDIR}/git" > > +RDEPENDS_${PN}-dev_append = " bash" > + > inherit systemd go > > # Besides the hosts specified in goarch, we do not build for mips. > diff --git > a/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch > > b/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch > deleted file mode 100644 > index 324530b..0000000 > --- > a/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From fb11d9e31788c912f94faf8b188278d54dc9a8f1 Mon Sep 17 00:00:00 2001 > -From: Bruce Ashfield <[email protected]> > -Date: Wed, 20 Apr 2016 16:34:50 -0400 > -Subject: [PATCH] prepared_query: make compatible with go1.5 > - > -The copying of a regex is only in go 1.6. We can take the chance of > -lock contention, so we drop the copy and use the regex directly. > - > -Signed-off-by: Bruce Ashfield <[email protected]> > ---- > - src/github.com/hashicorp/consul/consul/prepared_query/template.go | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git > a/src/github.com/hashicorp/consul/consul/prepared_query/template.go > b/src/github.com/hashicorp/consul/consul/prepared_query/template.go > -index 984f0bcf9cc6..1c61910c1526 100644 > ---- a/src/github.com/hashicorp/consul/consul/prepared_query/template.go > -+++ b/src/github.com/hashicorp/consul/consul/prepared_query/template.go > -@@ -116,8 +116,8 @@ func (ct *CompiledTemplate) Render(name string) > (*structs.PreparedQuery, error) > - // from multiple goroutines. > - var matches []string > - if ct.re != nil { > -- re := ct.re.Copy() > -- matches = re.FindStringSubmatch(name) > -+ // re := ct.re.Copy() > -+ matches = ct.re.FindStringSubmatch(name) > - } > - > - // Create a safe match function that can't fail at run time. It will > --- > -2.4.0.53.g8440f74 > - > -- > 2.17.1 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
