diff options
Diffstat (limited to 'sysutils/container-diff/files')
-rw-r--r-- | sysutils/container-diff/files/patch-uint32-Ino | 53 | ||||
-rw-r--r-- | sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go | 11 |
2 files changed, 11 insertions, 53 deletions
diff --git a/sysutils/container-diff/files/patch-uint32-Ino b/sysutils/container-diff/files/patch-uint32-Ino deleted file mode 100644 index a26888c5dfcc..000000000000 --- a/sysutils/container-diff/files/patch-uint32-Ino +++ /dev/null @@ -1,53 +0,0 @@ ---- vendor/github.com/docker/docker/pkg/archive/archive_unix.go.orig 2017-12-27 17:49:24 UTC -+++ vendor/github.com/docker/docker/pkg/archive/archive_unix.go -@@ -58,7 +58,7 @@ func setHeaderForSpecialDevice(hdr *tar. - return - } - --func getInodeFromStat(stat interface{}) (inode uint64, err error) { -+func getInodeFromStat(stat interface{}) (inode uint32, err error) { - s, ok := stat.(*syscall.Stat_t) - - if ok { ---- vendor/github.com/docker/docker/pkg/archive/archive.go.orig 2017-12-27 17:49:24 UTC -+++ vendor/github.com/docker/docker/pkg/archive/archive.go -@@ -378,7 +378,7 @@ type tarAppender struct { - Buffer *bufio.Writer - - // for hardlink mapping -- SeenFiles map[uint64]string -+ SeenFiles map[uint32]string - IDMappings *idtools.IDMappings - ChownOpts *idtools.IDPair - -@@ -391,7 +391,7 @@ type tarAppender struct { - - func newTarAppender(idMapping *idtools.IDMappings, writer io.Writer, chownOpts *idtools.IDPair) *tarAppender { - return &tarAppender{ -- SeenFiles: make(map[uint64]string), -+ SeenFiles: make(map[uint32]string), - TarWriter: tar.NewWriter(writer), - Buffer: pools.BufioWriter32KPool.Get(nil), - IDMappings: idMapping, ---- vendor/github.com/docker/docker/pkg/archive/changes_unix.go.orig 2017-12-27 17:49:24 UTC -+++ vendor/github.com/docker/docker/pkg/archive/changes_unix.go -@@ -28,7 +28,7 @@ func (info *FileInfo) isDir() bool { - return info.parent == nil || info.stat.Mode()&unix.S_IFDIR != 0 - } - --func getIno(fi os.FileInfo) uint64 { -+func getIno(fi os.FileInfo) uint32 { - return fi.Sys().(*syscall.Stat_t).Ino - } - ---- vendor/github.com/docker/docker/pkg/archive/changes.go.orig 2017-12-27 17:49:24 UTC -+++ vendor/github.com/docker/docker/pkg/archive/changes.go -@@ -363,7 +363,7 @@ func ChangesDirs(newDir, oldDir string) - func ChangesSize(newDir string, changes []Change) int64 { - var ( - size int64 -- sf = make(map[uint64]struct{}) -+ sf = make(map[uint32]struct{}) - ) - for _, change := range changes { - if change.Kind == ChangeModify || change.Kind == ChangeAdd { diff --git a/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go b/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go new file mode 100644 index 000000000000..090910c28702 --- /dev/null +++ b/sysutils/container-diff/files/patch-vendor-github.com-docker-docker-pkg-mount-mountinfo_freebsd.go @@ -0,0 +1,11 @@ +--- vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig 2018-10-02 00:39:19 UTC ++++ vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go +@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) + + if filter != nil { + // filter out entries we're not interested in +- skip, stop = filter(p) ++ skip, stop = filter(&mountinfo) + if skip { + continue + } |