summaryrefslogtreecommitdiff
path: root/sysutils/container-diff/files/patch-uint32-Ino
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2018-01-14 07:07:08 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2018-01-14 07:07:08 +0000
commit4ac654694954bef69b98c7033b5f68011e2c0f16 (patch)
treecc403ad5af5ec72706d09f4ab2fda604718a2605 /sysutils/container-diff/files/patch-uint32-Ino
parentFix build with Clang 6 (diff)
Fix build on -head (OSVERSION >= 1200031)
Ino is still uint32 for all versions of FreeBSD. Reference: https://golang.org/src/syscall/ztypes_freebsd_386.go https://golang.org/src/syscall/ztypes_freebsd_amd64.go https://golang.org/src/syscall/ztypes_freebsd_arm.go
Notes
Notes: svn path=/head/; revision=458955
Diffstat (limited to 'sysutils/container-diff/files/patch-uint32-Ino')
-rw-r--r--sysutils/container-diff/files/patch-uint32-Ino53
1 files changed, 53 insertions, 0 deletions
diff --git a/sysutils/container-diff/files/patch-uint32-Ino b/sysutils/container-diff/files/patch-uint32-Ino
new file mode 100644
index 000000000000..a26888c5dfcc
--- /dev/null
+++ b/sysutils/container-diff/files/patch-uint32-Ino
@@ -0,0 +1,53 @@
+--- 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 {