opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8907 from Luap99/fix-mips-build

Browse Source 
Fix build for mips architecture follow-up
This commit is contained in:
OpenShift Merge Robot
2021-01-07 15:12:35 -05:00
committed by GitHub
parent 6c132b78f1 65c88ec473
commit 78cda71372
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -106,7 +106,11 @@ CROSS_BUILD_TARGETS := \
bin/podman.cross.linux.arm \ bin/podman.cross.linux.arm \
bin/podman.cross.linux.arm64 \ bin/podman.cross.linux.arm64 \
bin/podman.cross.linux.386 \ bin/podman.cross.linux.386 \
bin/podman.cross.linux.s390x bin/podman.cross.linux.s390x \
bin/podman.cross.linux.mips \
bin/podman.cross.linux.mipsle \
bin/podman.cross.linux.mips64 \
bin/podman.cross.linux.mips64le
.PHONY: all .PHONY: all
all: binaries docs all: binaries docs

2
pkg/signal/signal_linux_mipsx.go
View File

@ -19,6 +19,8 @@ import (
const ( const (
sigrtmin = 34 sigrtmin = 34
sigrtmax = 127 sigrtmax = 127
SIGWINCH = syscall.SIGWINCH
) )
// signalMap is a map of Linux signals. // signalMap is a map of Linux signals.

16
pkg/specgen/generate/container.go
View File

@ -282,8 +282,8 @@ func finishThrottleDevices(s *specgen.SpecGenerator) error {
if err := unix.Stat(k, &statT); err != nil { if err := unix.Stat(k, &statT); err != nil {
return err return err
} }
v.Major = (int64(unix.Major(statT.Rdev))) v.Major = (int64(unix.Major(uint64(statT.Rdev))))
v.Minor = (int64(unix.Minor(statT.Rdev))) v.Minor = (int64(unix.Minor(uint64(statT.Rdev))))
s.ResourceLimits.BlockIO.ThrottleReadBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleReadBpsDevice, v) s.ResourceLimits.BlockIO.ThrottleReadBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleReadBpsDevice, v)
} }
} }
@ -293,8 +293,8 @@ func finishThrottleDevices(s *specgen.SpecGenerator) error {
if err := unix.Stat(k, &statT); err != nil { if err := unix.Stat(k, &statT); err != nil {
return err return err
} }
v.Major = (int64(unix.Major(statT.Rdev))) v.Major = (int64(unix.Major(uint64(statT.Rdev))))
v.Minor = (int64(unix.Minor(statT.Rdev))) v.Minor = (int64(unix.Minor(uint64(statT.Rdev))))
s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice, v) s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteBpsDevice, v)
} }
} }
@ -304,8 +304,8 @@ func finishThrottleDevices(s *specgen.SpecGenerator) error {
if err := unix.Stat(k, &statT); err != nil { if err := unix.Stat(k, &statT); err != nil {
return err return err
} }
v.Major = (int64(unix.Major(statT.Rdev))) v.Major = (int64(unix.Major(uint64(statT.Rdev))))
v.Minor = (int64(unix.Minor(statT.Rdev))) v.Minor = (int64(unix.Minor(uint64(statT.Rdev))))
s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice, v) s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleReadIOPSDevice, v)
} }
} }
@ -315,8 +315,8 @@ func finishThrottleDevices(s *specgen.SpecGenerator) error {
if err := unix.Stat(k, &statT); err != nil { if err := unix.Stat(k, &statT); err != nil {
return err return err
} }
v.Major = (int64(unix.Major(statT.Rdev))) v.Major = (int64(unix.Major(uint64(statT.Rdev))))
v.Minor = (int64(unix.Minor(statT.Rdev))) v.Minor = (int64(unix.Minor(uint64(statT.Rdev))))
s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice, v) s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice = append(s.ResourceLimits.BlockIO.ThrottleWriteIOPSDevice, v)
} }
} }