mirror of
https://github.com/containers/skopeo.git
synced 2025-09-08 18:19:37 +00:00
Revert mis-merged reverts of vendor.conf
PR #440 reverted the vendor.conf edits of #426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
15
vendor/golang.org/x/sys/unix/syscall_freebsd.go
generated
vendored
15
vendor/golang.org/x/sys/unix/syscall_freebsd.go
generated
vendored
@@ -120,6 +120,11 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func setattrlistTimes(path string, times []Timespec, flags int) error {
|
||||
// used on Darwin for UtimesNano
|
||||
return ENOSYS
|
||||
}
|
||||
|
||||
// Derive extattr namespace and attribute name
|
||||
|
||||
func xattrnamespace(fullattr string) (ns int, attr string, err error) {
|
||||
@@ -391,15 +396,6 @@ func IoctlGetTermios(fd int, req uint) (*Termios, error) {
|
||||
return &value, err
|
||||
}
|
||||
|
||||
//sys poll(fds *PollFd, nfds int, timeout int) (n int, err error)
|
||||
|
||||
func Poll(fds []PollFd, timeout int) (n int, err error) {
|
||||
if len(fds) == 0 {
|
||||
return poll(nil, 0, timeout)
|
||||
}
|
||||
return poll(&fds[0], len(fds), timeout)
|
||||
}
|
||||
|
||||
/*
|
||||
* Exposed directly
|
||||
*/
|
||||
@@ -559,7 +555,6 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
|
||||
// Searchfs
|
||||
// Delete
|
||||
// Copyfile
|
||||
// Poll
|
||||
// Watchevent
|
||||
// Waitevent
|
||||
// Modwatch
|
||||
|
Reference in New Issue
Block a user