From 502d6adc22c19ae378e3eb83aaf6c7eb27a60096 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 26 Oct 2020 14:53:35 -0700 Subject: [PATCH] Revender latest containerd/fifo fixes build on arm64 Signed-off-by: Benjamin Elder --- vendor.conf | 2 +- vendor/github.com/containerd/fifo/fifo.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vendor.conf b/vendor.conf index bcd4cf8d1..6cd2524b0 100644 --- a/vendor.conf +++ b/vendor.conf @@ -5,7 +5,7 @@ github.com/containerd/btrfs 153935315f4ab9be5bf03650a134 github.com/containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510 github.com/containerd/console v1.0.1 github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 -github.com/containerd/fifo cc76b10a4c47cdfac4bf6c373cc643628a72bfe9 +github.com/containerd/fifo 0724c46b320cf96bb172a0550c19a4b1fca4dacb github.com/containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c github.com/containerd/nri eb1350a75164f76de48e3605389e7a3fbc85d06e github.com/containerd/ttrpc v1.0.2 diff --git a/vendor/github.com/containerd/fifo/fifo.go b/vendor/github.com/containerd/fifo/fifo.go index 8a4e6eae2..96c214f27 100644 --- a/vendor/github.com/containerd/fifo/fifo.go +++ b/vendor/github.com/containerd/fifo/fifo.go @@ -25,6 +25,7 @@ import ( "syscall" "github.com/pkg/errors" + "golang.org/x/sys/unix" ) type fifo struct { @@ -48,7 +49,7 @@ func OpenFifoDup2(ctx context.Context, fn string, flag int, perm os.FileMode, fd return nil, errors.Wrap(err, "fifo error") } - if err := syscall.Dup2(int(f.file.Fd()), fd); err != nil { + if err := unix.Dup2(int(f.file.Fd()), fd); err != nil { _ = f.Close() return nil, errors.Wrap(err, "dup2 error") }