From 75d038d03f95193a4490dfb0990fc796b1ece2dd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 17 Feb 2018 00:35:34 +0100 Subject: [PATCH] Update containerd/continuity to fix ARM 32-bit builds This updates the containerd/continuity package to d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371 which fixes builds failing on ARM 32-bit, after this dependency was added in b3aab5e31faf04d8a29f17be55562e4d0c0cb364 Signed-off-by: Sebastiaan van Stijn Upstream-commit: f0947a541866ca05b030afe07dd659887a655e3e Component: engine --- components/engine/vendor.conf | 2 +- .../github.com/containerd/continuity/fs/stat_linux.go | 3 ++- .../github.com/containerd/continuity/sysx/xattr_openbsd.go | 7 +++++++ .../containerd/continuity/sysx/xattr_unsupported.go | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 components/engine/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 11ffb11cd3..939c53625b 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -110,7 +110,7 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 # containerd github.com/containerd/containerd 3fa104f843ec92328912e042b767d26825f202aa github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6 -github.com/containerd/continuity 992a5f112bd2211d0983a1cc8562d2882848f3a3 +github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371 github.com/containerd/cgroups c0710c92e8b3a44681d1321dcfd1360fc5c6c089 github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f diff --git a/components/engine/vendor/github.com/containerd/continuity/fs/stat_linux.go b/components/engine/vendor/github.com/containerd/continuity/fs/stat_linux.go index 25bc652581..1dbb0212b6 100644 --- a/components/engine/vendor/github.com/containerd/continuity/fs/stat_linux.go +++ b/components/engine/vendor/github.com/containerd/continuity/fs/stat_linux.go @@ -22,5 +22,6 @@ func StatMtime(st *syscall.Stat_t) syscall.Timespec { // StatATimeAsTime returns st.Atim as a time.Time func StatATimeAsTime(st *syscall.Stat_t) time.Time { - return time.Unix(st.Atim.Sec, st.Atim.Nsec) + // The int64 conversions ensure the line compiles for 32-bit systems as well. + return time.Unix(int64(st.Atim.Sec), int64(st.Atim.Nsec)) // nolint: unconvert } diff --git a/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go b/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go new file mode 100644 index 0000000000..723619977d --- /dev/null +++ b/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go @@ -0,0 +1,7 @@ +package sysx + +import ( + "errors" +) + +var unsupported = errors.New("extended attributes unsupported on OpenBSD") diff --git a/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go b/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go index a8dd9f245f..c8389bc136 100644 --- a/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go +++ b/components/engine/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go @@ -1,4 +1,4 @@ -// +build freebsd solaris +// +build freebsd openbsd solaris package sysx