Initial commit
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
DESCRIPTION = "C++ API for etcd's v3 client API"
|
||||
HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3"
|
||||
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450"
|
||||
|
||||
SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https"
|
||||
SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16"
|
||||
|
||||
inherit cmake
|
||||
|
||||
DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON"
|
||||
|
||||
INSANE_SKIP:${PN}:append = " ldflags"
|
||||
SOLIBS = ".so"
|
||||
FILES_SOLIBSDEV = ""
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
From a57d78a94e7cbc8cfa468b58c7d4e23668c05fec Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Geissler <geissonator@yahoo.com>
|
||||
Date: Tue, 2 May 2023 13:36:36 -0600
|
||||
Subject: [PATCH] test_lib.sh: remove gobin requirement during build
|
||||
|
||||
This tool is installed as a part of the build process (build.sh sources
|
||||
test_lib.sh)
|
||||
|
||||
This tool has been removed in the latest etcd main branch. Installing it
|
||||
as a part of the build process breaks bitbake (it doesn't allow
|
||||
downloading of packages once in the build steps).
|
||||
|
||||
This tool is not needed to build etcd (it appears to be used for some
|
||||
optional test cases).
|
||||
|
||||
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
scripts/test_lib.sh | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh
|
||||
index 44b9d2895..da97a9c26 100644
|
||||
--- a/scripts/test_lib.sh
|
||||
+++ b/scripts/test_lib.sh
|
||||
@@ -140,7 +140,7 @@ function run {
|
||||
command=("${command[@]@Q}")
|
||||
if [[ "${rpath}" != "." && "${rpath}" != "" ]]; then
|
||||
repro="(cd ${rpath} && ${command[*]})"
|
||||
- else
|
||||
+ else
|
||||
repro="${command[*]}"
|
||||
fi
|
||||
|
||||
@@ -305,7 +305,11 @@ function tool_exists {
|
||||
|
||||
# Ensure gobin is available, as it runs majority of the tools
|
||||
if ! command -v "gobin" >/dev/null; then
|
||||
- run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
|
||||
+ # This script is run as a part of the build process. Installing packages
|
||||
+ # during the build process is not allowed in bitbake.
|
||||
+ # Gobin is deprecated and not needed when building in the bitbake env
|
||||
+ echo "Not installing gobin in bitbake env"
|
||||
+ # run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
|
||||
fi
|
||||
|
||||
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
|
||||
--
|
||||
2.37.1 (Apple Git-137.1)
|
||||
|
||||
+205
@@ -0,0 +1,205 @@
|
||||
From e99ee73e7660689203b83fab6b26c400191b145c Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Geissler <geissonator@yahoo.com>
|
||||
Date: Fri, 24 Mar 2023 10:00:35 -0500
|
||||
Subject: [PATCH] xxhash: bump to v2.1.2
|
||||
|
||||
There is a known issue in v2.1.1:
|
||||
|
||||
https://github.com/cespare/xxhash/issues/54
|
||||
|
||||
Fix that issue by bumping to the version with the fix.
|
||||
|
||||
This has been fixed in upstream etcd via the following:
|
||||
|
||||
https://github.com/etcd-io/etcd/commit/f0f77fc14e3bd4d94a953b490e810a06ef36695a
|
||||
|
||||
But it was a pretty major upgrade so just take the one piece we need for
|
||||
the etcd v3.5 release tag.
|
||||
|
||||
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
client/v3/go.mod | 2 +-
|
||||
client/v3/go.sum | 2 ++
|
||||
etcdctl/go.mod | 2 +-
|
||||
etcdctl/go.sum | 3 ++-
|
||||
etcdutl/go.mod | 2 +-
|
||||
etcdutl/go.sum | 3 ++-
|
||||
go.mod | 2 +-
|
||||
go.sum | 3 ++-
|
||||
server/go.mod | 2 +-
|
||||
server/go.sum | 3 ++-
|
||||
tests/go.mod | 2 +-
|
||||
tests/go.sum | 3 ++-
|
||||
12 files changed, 18 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/client/v3/go.mod b/client/v3/go.mod
|
||||
index ec286316a..6e72eb067 100644
|
||||
--- a/client/v3/go.mod
|
||||
+++ b/client/v3/go.mod
|
||||
@@ -15,7 +15,7 @@ require (
|
||||
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/coreos/go-semver v0.3.0 // indirect
|
||||
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
diff --git a/client/v3/go.sum b/client/v3/go.sum
|
||||
index 024078504..8866fabba 100644
|
||||
--- a/client/v3/go.sum
|
||||
+++ b/client/v3/go.sum
|
||||
@@ -14,6 +14,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
|
||||
index 2101ed78e..3a727b492 100644
|
||||
--- a/etcdctl/go.mod
|
||||
+++ b/etcdctl/go.mod
|
||||
@@ -23,7 +23,7 @@ require (
|
||||
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/coreos/go-semver v0.3.0 // indirect
|
||||
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
|
||||
diff --git a/etcdctl/go.sum b/etcdctl/go.sum
|
||||
index 980aca775..765a77e72 100644
|
||||
--- a/etcdctl/go.sum
|
||||
+++ b/etcdctl/go.sum
|
||||
@@ -38,8 +38,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
|
||||
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
|
||||
index 24fd3f1bb..7f7ad8bc4 100644
|
||||
--- a/etcdutl/go.mod
|
||||
+++ b/etcdutl/go.mod
|
||||
@@ -36,7 +36,7 @@ require (
|
||||
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/coreos/go-semver v0.3.0 // indirect
|
||||
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
diff --git a/etcdutl/go.sum b/etcdutl/go.sum
|
||||
index 7d3675855..4c894740e 100644
|
||||
--- a/etcdutl/go.sum
|
||||
+++ b/etcdutl/go.sum
|
||||
@@ -37,8 +37,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
|
||||
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
diff --git a/go.mod b/go.mod
|
||||
index 3df2c43e1..f794ab8d2 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -39,7 +39,7 @@ require (
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 // indirect
|
||||
github.com/cockroachdb/errors v1.9.0 // indirect
|
||||
github.com/coreos/go-semver v0.3.0 // indirect
|
||||
diff --git a/go.sum b/go.sum
|
||||
index 7bb455e8b..e2e07cfe4 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -50,8 +50,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
|
||||
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
diff --git a/server/go.mod b/server/go.mod
|
||||
index 46dcfad08..ab635e592 100644
|
||||
--- a/server/go.mod
|
||||
+++ b/server/go.mod
|
||||
@@ -47,7 +47,7 @@ require (
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/gorilla/websocket v1.4.2 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||
diff --git a/server/go.sum b/server/go.sum
|
||||
index 8f78c3864..c4fbfac25 100644
|
||||
--- a/server/go.sum
|
||||
+++ b/server/go.sum
|
||||
@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
|
||||
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
diff --git a/tests/go.mod b/tests/go.mod
|
||||
index b578bbf02..45820817c 100644
|
||||
--- a/tests/go.mod
|
||||
+++ b/tests/go.mod
|
||||
@@ -46,7 +46,7 @@ require (
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
|
||||
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/coreos/go-semver v0.3.0 // indirect
|
||||
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
|
||||
github.com/creack/pty v1.1.11 // indirect
|
||||
diff --git a/tests/go.sum b/tests/go.sum
|
||||
index 203bf65d6..46c18c31f 100644
|
||||
--- a/tests/go.sum
|
||||
+++ b/tests/go.sum
|
||||
@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
|
||||
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
|
||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
||||
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
||||
--
|
||||
2.37.1 (Apple Git-137.1)
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
# This is the configuration file to start the etcd server with
|
||||
# existing cluster configuration in the data directory.
|
||||
|
||||
# Initial cluster state ('new' or 'existing').
|
||||
ETCD_INITIAL_CLUSTER_STATE='existing'
|
||||
|
||||
# Path to the data directory.
|
||||
ETCD_DATA_DIR='/var/lib/etcd'
|
||||
|
||||
# Time (in milliseconds) of a heartbeat interval.
|
||||
ETCD_HEARTBEAT_INTERVAL=100
|
||||
|
||||
# Time (in milliseconds) for an election to timeout.
|
||||
ETCD_ELECTION_TIMEOUT=1000
|
||||
|
||||
# List of comma separated URLs to listen on for peer traffic.
|
||||
ETCD_LISTEN_PEER_URLS=http://localhost:2380
|
||||
|
||||
# List of comma separated URLs to listen on for client traffic.
|
||||
ETCD_LISTEN_CLIENT_URLS=http://localhost:2379
|
||||
|
||||
# List of this member's peer URLs to advertise to the rest of the cluster.
|
||||
# The URLs needed to be a comma-separated list.
|
||||
ETCD_INITIAL_ADVERTISE_PEER_URLS=http://localhost:2380
|
||||
|
||||
# List of this member's client URLs to advertise to the public.
|
||||
# The URLs needed to be a comma-separated list.
|
||||
ETCD_ADVERTISE_CLIENT_URLS=http://localhost:2379
|
||||
|
||||
# Enable info-level logging for etcd.
|
||||
ETCD_LOG_LEVEL='info'
|
||||
|
||||
# Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.
|
||||
ETCD_LOG_OUTPUTS='default'
|
||||
|
||||
# etcd is not officially supported on arm64
|
||||
ETCD_UNSUPPORTED_ARCH='arm'
|
||||
@@ -0,0 +1,9 @@
|
||||
[Unit]
|
||||
Description=Monitor the etcd config file changes
|
||||
|
||||
[Path]
|
||||
PathChanged=/run/etcd-new.conf
|
||||
Unit=etcd-new.service
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=etcd cluster member start/add service
|
||||
Documentation=https://etcd.io/docs/v3.5/op-guide/clustering/
|
||||
ConditionPathExists=!/var/lib/etcd/member
|
||||
ConditionPathExists=/run/etcd-new.conf
|
||||
OnFailure=etcd.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
EnvironmentFile=/run/etcd-new.conf
|
||||
ExecStart=/usr/bin/etcd
|
||||
Restart=no
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=etcd key-value store
|
||||
Documentation=https://github.com/etcd-io/etcd
|
||||
After=network-online.target local-fs.target remote-fs.target time-sync.target
|
||||
Wants=network-online.target local-fs.target remote-fs.target time-sync.target
|
||||
ConditionPathExists=/var/lib/etcd/member
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
EnvironmentFile=/etc/etcd.d/etcd-existing.conf
|
||||
ExecStart=/usr/bin/etcd
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,73 @@
|
||||
DESCRIPTION = "etcd is a distributed key-value store for distributed systems"
|
||||
HOMEPAGE = "https://etcd.io/"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \
|
||||
file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \
|
||||
file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \
|
||||
file://etcd.service \
|
||||
file://etcd-existing.conf \
|
||||
file://etcd-new.service \
|
||||
file://etcd-new.path \
|
||||
"
|
||||
|
||||
SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
GO_IMPORT = "go.etcd.io/etcd/v3"
|
||||
GO_INSTALL = "src/${GO_IMPORT}/"
|
||||
|
||||
RDEPENDS:${PN}-dev = " \
|
||||
bash \
|
||||
"
|
||||
|
||||
export GO111MODULE="on"
|
||||
|
||||
inherit go systemd pkgconfig features_check
|
||||
|
||||
# Go based binaries do not handle being stripped
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
INHIBIT_SYSROOT_STRIP = "1"
|
||||
|
||||
# network is required by go to get dependent packages
|
||||
do_compile[network] = "1"
|
||||
|
||||
# Need to build etcd out of where it is extracted to
|
||||
# Need to directly call build script vs. "make build"
|
||||
# because "make build" executes the generated binaries
|
||||
# at the end of the build which do not run correctly
|
||||
# when cross compiling for another machine
|
||||
go_do_compile:prepend() {
|
||||
cd ${GO_INSTALL}
|
||||
./build.sh
|
||||
|
||||
|
||||
# Lots of discussion in go community about how it sets packages to
|
||||
# read-only by default -> https://github.com/golang/go/issues/31481
|
||||
# etcd is going to need some upstream work to support it.
|
||||
# For now, set the packages which are read-only back to
|
||||
# writeable so things like "bitbake -c cleanall etcd" will work.
|
||||
chmod u+w -R ${WORKDIR}/build/pkg/mod
|
||||
}
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "systemd"
|
||||
SYSTEMD_PACKAGES = "${PN}"
|
||||
SYSTEMD_SERVICE:${PN}:append = " etcd.service etcd-new.service etcd-new.path"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${bindir}/
|
||||
install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir}
|
||||
install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir}
|
||||
install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir}
|
||||
install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d
|
||||
install -d ${D}${systemd_system_unitdir}
|
||||
install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/
|
||||
install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/
|
||||
install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/
|
||||
}
|
||||
|
||||
FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf"
|
||||
|
||||
Reference in New Issue
Block a user