diff options
Diffstat (limited to 'recipes-connectivity')
-rw-r--r-- | recipes-connectivity/consul/consul_git.bb | 22 | ||||
-rw-r--r-- | recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch | 8 |
2 files changed, 11 insertions, 19 deletions
diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb index 5f86597..a44e0b2 100644 --- a/recipes-connectivity/consul/consul_git.bb +++ b/recipes-connectivity/consul/consul_git.bb | |||
@@ -1,30 +1,22 @@ | |||
1 | DESCRIPTION = "A tool for discovering and configuring services in your infrastructure" | 1 | DESCRIPTION = "A tool for discovering and configuring services in your infrastructure" |
2 | HOMEPAGE = "https://www.consul.io/" | 2 | HOMEPAGE = "https://www.consul.io/" |
3 | LICENSE = "MPL-2.0" | 3 | LICENSE = "MPL-2.0 & BSD & Apache-2.0 & BSD-2-Clause & MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b278a92d2c1509760384428817710378" | 4 | LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul/LICENSE;md5=b278a92d2c1509760384428817710378" |
5 | 5 | ||
6 | PKG_NAME = "github.com/hashicorp/consul" | 6 | GO_IMPORT = "github.com/hashicorp/consul" |
7 | SRC_URI = "git://${PKG_NAME}.git \ | 7 | SRCREV = "f97afda8e15046b41d951bf3b4220372c45df7ab" |
8 | SRC_URI = "git://${GO_IMPORT}.git \ | ||
8 | file://consul.service \ | 9 | file://consul.service \ |
9 | file://0001-prepared_query-make-compatible-with-go1.5.patch \ | 10 | file://0001-prepared_query-make-compatible-with-go1.5.patch \ |
10 | " | 11 | " |
11 | SRCREV = "f97afda8e15046b41d951bf3b4220372c45df7ab" | ||
12 | |||
13 | CCACHE = "" | ||
14 | 12 | ||
15 | inherit systemd golang | 13 | S = "${WORKDIR}/git" |
16 | 14 | ||
17 | INSANE_SKIP_${PN} += "ldflags" | 15 | inherit systemd go |
18 | 16 | ||
19 | SYSTEMD_SERVICE_${PN} = "consul.service" | 17 | SYSTEMD_SERVICE_${PN} = "consul.service" |
20 | SYSTEMD_AUTO_ENABLE_${PN} = "enable" | 18 | SYSTEMD_AUTO_ENABLE_${PN} = "enable" |
21 | 19 | ||
22 | export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" | ||
23 | |||
24 | #Stops go from installing and testing the package | ||
25 | do_configure(){ | ||
26 | } | ||
27 | |||
28 | do_install_append() { | 20 | do_install_append() { |
29 | install -d ${D}/${systemd_unitdir}/system | 21 | install -d ${D}/${systemd_unitdir}/system |
30 | cp ${WORKDIR}/consul.service ${D}/${systemd_unitdir}/system | 22 | cp ${WORKDIR}/consul.service ${D}/${systemd_unitdir}/system |
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 index a66e1dc..324530b 100644 --- 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 | |||
@@ -8,13 +8,13 @@ lock contention, so we drop the copy and use the regex directly. | |||
8 | 8 | ||
9 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 9 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
10 | --- | 10 | --- |
11 | consul/prepared_query/template.go | 4 ++-- | 11 | src/github.com/hashicorp/consul/consul/prepared_query/template.go | 4 ++-- |
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | 12 | 1 file changed, 2 insertions(+), 2 deletions(-) |
13 | 13 | ||
14 | diff --git a/consul/prepared_query/template.go b/consul/prepared_query/template.go | 14 | diff --git a/src/github.com/hashicorp/consul/consul/prepared_query/template.go b/src/github.com/hashicorp/consul/consul/prepared_query/template.go |
15 | index 984f0bcf9cc6..1c61910c1526 100644 | 15 | index 984f0bcf9cc6..1c61910c1526 100644 |
16 | --- a/consul/prepared_query/template.go | 16 | --- a/src/github.com/hashicorp/consul/consul/prepared_query/template.go |
17 | +++ b/consul/prepared_query/template.go | 17 | +++ b/src/github.com/hashicorp/consul/consul/prepared_query/template.go |
18 | @@ -116,8 +116,8 @@ func (ct *CompiledTemplate) Render(name string) (*structs.PreparedQuery, error) | 18 | @@ -116,8 +116,8 @@ func (ct *CompiledTemplate) Render(name string) (*structs.PreparedQuery, error) |
19 | // from multiple goroutines. | 19 | // from multiple goroutines. |
20 | var matches []string | 20 | var matches []string |