Skip to content

Commit

Permalink
go.mod: update golang.org/x/sys to latest unreleased version
Browse files Browse the repository at this point in the history
Updating golang.org/x/sys/unix to the recently released v0.14.0 will
break the build because of the missing definition of
BPF_F_KPROBE_MULTI_RETURN, see
golang/go#63969 and
#1206.

This was fixed upstream in https://go.dev/cl/540395, so manually pull in
the latest unreleased version to allow modules depending on cilium/ebpf
to update to later versions as well.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
  • Loading branch information
tklauser authored and lmb committed Nov 9, 2023
1 parent 1027911 commit 36f6316
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -6,7 +6,7 @@ require (
github.com/frankban/quicktest v1.14.5
github.com/google/go-cmp v0.5.9
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
golang.org/x/sys v0.6.0
golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -12,5 +12,5 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c h1:3kC/TjQ+xzIblQv39bCOyRk8fbEeJcDHwbyxPUU2BpA=
golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

0 comments on commit 36f6316

Please sign in to comment.