diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-09-18 16:27:31 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-09-25 17:40:49 -0400 |
commit | 5793d336ae63744d573821aba2f2b22000aae0c1 (patch) | |
tree | da4f2747eded136d853a3ab6b55f65f2eda9ac6c | |
parent | d684262a05535e41c017fde24a6d5348e8aed3c9 (diff) | |
download | meta-cloud-services-5793d336ae63744d573821aba2f2b22000aae0c1.tar.gz |
consul-migrate: update to use go.bbclass
We do not want meta-cloud-services to depend on meta-overc so we
switch to use the go.bbclass which is now part of oe-core/yocto. We
also capture all the licenses for all source packages which are
included in consul-migrate and adjust paths to account for the
different handling of go.bbclass vs. golang.bbclass.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-connectivity/consul/consul-migrate_git.bb | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/recipes-connectivity/consul/consul-migrate_git.bb b/recipes-connectivity/consul/consul-migrate_git.bb index 935d663..8419cb8 100644 --- a/recipes-connectivity/consul/consul-migrate_git.bb +++ b/recipes-connectivity/consul/consul-migrate_git.bb | |||
@@ -1,12 +1,14 @@ | |||
1 | SUMMARY = "Provides data migration for Consul server nodes" | 1 | SUMMARY = "Provides data migration for Consul server nodes" |
2 | HOMEPAGE = "https://github.com/hashicorp/consul-migrate" | 2 | HOMEPAGE = "https://github.com/hashicorp/consul-migrate" |
3 | LICENSE = "MPL-2.0" | 3 | LICENSE = "BSD & MPL-2.0 & MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b278a92d2c1509760384428817710378" | 4 | LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul-migrate/LICENSE;md5=b278a92d2c1509760384428817710378" |
5 | 5 | ||
6 | PKG_NAME = "github.com/hashicorp/consul-migrate" | 6 | GO_IMPORT = "github.com/hashicorp/consul-migrate" |
7 | SRC_URI = "git://${PKG_NAME}.git" | 7 | SRC_URI = "git://${GO_IMPORT}.git" |
8 | SRCREV = "678fb10cdeae25ab309e99e655148f0bf65f9710" | 8 | SRCREV = "678fb10cdeae25ab309e99e655148f0bf65f9710" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | ||
11 | |||
10 | SRCREV_raft = "057b893fd996696719e98b6c44649ea14968c811" | 12 | SRCREV_raft = "057b893fd996696719e98b6c44649ea14968c811" |
11 | SRCREV_go-metrics = "f303b03b91d770a11a39677f1d3b55da4002bbcb" | 13 | SRCREV_go-metrics = "f303b03b91d770a11a39677f1d3b55da4002bbcb" |
12 | SRCREV_raft-boltdb = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee" | 14 | SRCREV_raft-boltdb = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee" |
@@ -25,18 +27,18 @@ SRC_URI += " \ | |||
25 | git://github.com/hashicorp/go-msgpack;name=go-msgpack;destsuffix=git/src/github.com/hashicorp/go-msgpack \ | 27 | git://github.com/hashicorp/go-msgpack;name=go-msgpack;destsuffix=git/src/github.com/hashicorp/go-msgpack \ |
26 | " | 28 | " |
27 | 29 | ||
28 | inherit golang | 30 | inherit go |
29 | |||
30 | SYSROOT_PREPROCESS_FUNCS += "consul_migrate_sysroot_preprocess" | ||
31 | 31 | ||
32 | export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" | 32 | # GO packages shouldn't rely on external libs, but this one will |
33 | # not build without this. | ||
34 | LDFLAGS += "-lpthread" | ||
33 | 35 | ||
34 | consul_migrate_sysroot_preprocess () { | 36 | GO_INSTALL_FILTEROUT = " \ |
35 | install -d ${SYSROOT_DESTDIR}${prefix}/local/go/src/${PKG_NAME} | 37 | github.com/hashicorp/raft \ |
36 | cp -a ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) | 38 | github.com/armon/go-metrics \ |
37 | install -d ${SYSROOT_DESTDIR}${prefix}/bin | 39 | github.com/hashicorp/raft-boltdb \ |
38 | cp -a ${D}${prefix}/bin/* ${SYSROOT_DESTDIR}${prefix}/bin/ | 40 | github.com/hashicorp/raft-mdb \ |
39 | } | 41 | github.com/armon/gomdb \ |
40 | 42 | github.com/boltdb/bolt \ | |
41 | CLEANBROKEN = "1" | 43 | github.com/hashicorp/go-msgpack \ |
42 | INSANE_SKIP_${PN} = "ldflags" | 44 | " |