docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cross compile 

stat.Rdev and time.* is 32bit on OSX, which breaks cross builds with eg:
cannot use stat.Rdev (type int32) as type uint64 in function argument

We fix this with an extra conversion to uint64.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
This commit is contained in:
Alexander Larsson 2014-01-15 10:07:47 +01:00
parent d54ce8087a
commit ba52130873
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archive/changes.go
View File

@ -361,8 +361,8 @@ func ExportChanges(dir string, changes []Change) (Archive, error) {
Mode: int64(stat.Mode & 07777), Mode: int64(stat.Mode & 07777),
Uid: int(stat.Uid), Uid: int(stat.Uid),
Gid: int(stat.Gid), Gid: int(stat.Gid),
ModTime: time.Unix(mtim.Sec, mtim.Nsec), ModTime: time.Unix(int64(mtim.Sec), int64(mtim.Nsec)),
AccessTime: time.Unix(atim.Sec, atim.Nsec), AccessTime: time.Unix(int64(atim.Sec), int64(atim.Nsec)),
} }
if stat.Mode&syscall.S_IFDIR == syscall.S_IFDIR { if stat.Mode&syscall.S_IFDIR == syscall.S_IFDIR {
@ -382,8 +382,8 @@ func ExportChanges(dir string, changes []Change) (Archive, error) {
} else { } else {
hdr.Typeflag = tar.TypeChar hdr.Typeflag = tar.TypeChar
} }
hdr.Devmajor = int64(major(stat.Rdev)) hdr.Devmajor = int64(major(uint64(stat.Rdev)))
hdr.Devminor = int64(minor(stat.Rdev)) hdr.Devminor = int64(minor(uint64(stat.Rdev)))
} else if stat.Mode&syscall.S_IFIFO == syscall.S_IFIFO || } else if stat.Mode&syscall.S_IFIFO == syscall.S_IFIFO ||
stat.Mode&syscall.S_IFSOCK == syscall.S_IFSOCK { stat.Mode&syscall.S_IFSOCK == syscall.S_IFSOCK {
hdr.Typeflag = tar.TypeFifo hdr.Typeflag = tar.TypeFifo