summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-03-24 11:52:06 -0500
committerKhem Raj <raj.khem@gmail.com>2023-05-02 14:16:58 -0700
commit078e867c9763f48e4a5425f698e43a8148bffd77 (patch)
tree8f73b0c302f250f126d27c7e309b1a71e078b18a
parent05c9ba951ed0bb609d0ca139beca689d3b0e0793 (diff)
downloadmeta-openembedded-078e867c9763f48e4a5425f698e43a8148bffd77.tar.gz
etcd: use v2.1.2 xhash to fix build issue
Fixes: | # github.com/cespare/xxhash/v2 | asm: xxhash_amd64.s:120: when dynamic linking, R15 is clobbered by a global | variable access and is used here: | 00092 (/home/pokybuild/yocto-worker/meta-oe/cespare/xxhash/v2@v2.1.1/xxhash_amd64.s:120) ADDQ R15, AX | asm: assembly failed Upstream-Status: Backport [https://github.com/etcd-io/etcd/commit/f0f77fc14e3bd4d94a953b490e810a06ef36695a] Limited PR with just this patch submitted via this PR: https://github.com/etcd-io/etcd/pull/15556 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch203
-rw-r--r--meta-oe/recipes-extended/etcd/etcd_3.5.7.bb6
2 files changed, 208 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch b/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch
new file mode 100644
index 0000000000..2893258264
--- /dev/null
+++ b/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch
@@ -0,0 +1,203 @@
1From e99ee73e7660689203b83fab6b26c400191b145c Mon Sep 17 00:00:00 2001
2From: Andrew Geissler <geissonator@yahoo.com>
3Date: Fri, 24 Mar 2023 10:00:35 -0500
4Subject: [PATCH] xxhash: bump to v2.1.2
5
6There is a known issue in v2.1.1:
7
8 https://github.com/cespare/xxhash/issues/54
9
10Fix that issue by bumping to the version with the fix.
11
12This has been fixed in upstream etcd via the following:
13
14 https://github.com/etcd-io/etcd/commit/f0f77fc14e3bd4d94a953b490e810a06ef36695a
15
16But it was a pretty major upgrade so just take the one piece we need for
17the etcd v3.5 release tag.
18
19Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
20---
21 client/v3/go.mod | 2 +-
22 client/v3/go.sum | 2 ++
23 etcdctl/go.mod | 2 +-
24 etcdctl/go.sum | 3 ++-
25 etcdutl/go.mod | 2 +-
26 etcdutl/go.sum | 3 ++-
27 go.mod | 2 +-
28 go.sum | 3 ++-
29 server/go.mod | 2 +-
30 server/go.sum | 3 ++-
31 tests/go.mod | 2 +-
32 tests/go.sum | 3 ++-
33 12 files changed, 18 insertions(+), 11 deletions(-)
34
35diff --git a/client/v3/go.mod b/client/v3/go.mod
36index ec286316a..6e72eb067 100644
37--- a/client/v3/go.mod
38+++ b/client/v3/go.mod
39@@ -15,7 +15,7 @@ require (
40
41 require (
42 github.com/beorn7/perks v1.0.1 // indirect
43- github.com/cespare/xxhash/v2 v2.1.1 // indirect
44+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
45 github.com/coreos/go-semver v0.3.0 // indirect
46 github.com/coreos/go-systemd/v22 v22.3.2 // indirect
47 github.com/gogo/protobuf v1.3.2 // indirect
48diff --git a/client/v3/go.sum b/client/v3/go.sum
49index 024078504..8866fabba 100644
50--- a/client/v3/go.sum
51+++ b/client/v3/go.sum
52@@ -14,6 +14,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
53 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
54 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
55 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
56+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
57+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
58 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
59 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
60 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
61diff --git a/etcdctl/go.mod b/etcdctl/go.mod
62index 2101ed78e..3a727b492 100644
63--- a/etcdctl/go.mod
64+++ b/etcdctl/go.mod
65@@ -23,7 +23,7 @@ require (
66
67 require (
68 github.com/beorn7/perks v1.0.1 // indirect
69- github.com/cespare/xxhash/v2 v2.1.1 // indirect
70+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
71 github.com/coreos/go-semver v0.3.0 // indirect
72 github.com/coreos/go-systemd/v22 v22.3.2 // indirect
73 github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
74diff --git a/etcdctl/go.sum b/etcdctl/go.sum
75index 980aca775..765a77e72 100644
76--- a/etcdctl/go.sum
77+++ b/etcdctl/go.sum
78@@ -38,8 +38,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
79 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
80 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
81 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
82-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
83 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
84+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
85+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
86 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
87 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
88 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
89diff --git a/etcdutl/go.mod b/etcdutl/go.mod
90index 24fd3f1bb..7f7ad8bc4 100644
91--- a/etcdutl/go.mod
92+++ b/etcdutl/go.mod
93@@ -36,7 +36,7 @@ require (
94
95 require (
96 github.com/beorn7/perks v1.0.1 // indirect
97- github.com/cespare/xxhash/v2 v2.1.1 // indirect
98+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
99 github.com/coreos/go-semver v0.3.0 // indirect
100 github.com/coreos/go-systemd/v22 v22.3.2 // indirect
101 github.com/gogo/protobuf v1.3.2 // indirect
102diff --git a/etcdutl/go.sum b/etcdutl/go.sum
103index 7d3675855..4c894740e 100644
104--- a/etcdutl/go.sum
105+++ b/etcdutl/go.sum
106@@ -37,8 +37,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
107 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
108 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
109 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
110-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
111 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
112+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
113+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
114 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
115 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
116 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
117diff --git a/go.mod b/go.mod
118index 3df2c43e1..f794ab8d2 100644
119--- a/go.mod
120+++ b/go.mod
121@@ -39,7 +39,7 @@ require (
122 require (
123 github.com/beorn7/perks v1.0.1 // indirect
124 github.com/cenkalti/backoff/v4 v4.1.1 // indirect
125- github.com/cespare/xxhash/v2 v2.1.1 // indirect
126+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
127 github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 // indirect
128 github.com/cockroachdb/errors v1.9.0 // indirect
129 github.com/coreos/go-semver v0.3.0 // indirect
130diff --git a/go.sum b/go.sum
131index 7bb455e8b..e2e07cfe4 100644
132--- a/go.sum
133+++ b/go.sum
134@@ -50,8 +50,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
135 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
136 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
137 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
138-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
139 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
140+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
141+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
142 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
143 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
144 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
145diff --git a/server/go.mod b/server/go.mod
146index 46dcfad08..ab635e592 100644
147--- a/server/go.mod
148+++ b/server/go.mod
149@@ -47,7 +47,7 @@ require (
150 require (
151 github.com/beorn7/perks v1.0.1 // indirect
152 github.com/cenkalti/backoff/v4 v4.1.1 // indirect
153- github.com/cespare/xxhash/v2 v2.1.1 // indirect
154+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
155 github.com/davecgh/go-spew v1.1.1 // indirect
156 github.com/gorilla/websocket v1.4.2 // indirect
157 github.com/inconshreveable/mousetrap v1.0.0 // indirect
158diff --git a/server/go.sum b/server/go.sum
159index 8f78c3864..c4fbfac25 100644
160--- a/server/go.sum
161+++ b/server/go.sum
162@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
163 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
164 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
165 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
166-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
167 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
168+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
169+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
170 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
171 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
172 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
173diff --git a/tests/go.mod b/tests/go.mod
174index b578bbf02..45820817c 100644
175--- a/tests/go.mod
176+++ b/tests/go.mod
177@@ -46,7 +46,7 @@ require (
178 require (
179 github.com/beorn7/perks v1.0.1 // indirect
180 github.com/cenkalti/backoff/v4 v4.1.1 // indirect
181- github.com/cespare/xxhash/v2 v2.1.1 // indirect
182+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
183 github.com/coreos/go-semver v0.3.0 // indirect
184 github.com/coreos/go-systemd/v22 v22.3.2 // indirect
185 github.com/creack/pty v1.1.11 // indirect
186diff --git a/tests/go.sum b/tests/go.sum
187index 203bf65d6..46c18c31f 100644
188--- a/tests/go.sum
189+++ b/tests/go.sum
190@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
191 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
192 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
193 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
194-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
195 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
196+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
197+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
198 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
199 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
200 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
201--
2022.37.1 (Apple Git-137.1)
203
diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
index 0635da942b..b2c20404a7 100644
--- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
+++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
@@ -4,7 +4,11 @@ HOMEPAGE = "https://etcd.io/"
4LICENSE = "Apache-2.0" 4LICENSE = "Apache-2.0"
5LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 5LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
6 6
7SRC_URI = "git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https" 7SRC_URI = " \
8 git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \
9 file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \
10"
11
8SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f" 12SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f"
9UPSTREAM_CHECK_COMMITS = "1" 13UPSTREAM_CHECK_COMMITS = "1"
10 14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-16 17:07:57 +0000