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

Fix builds on 32 bit arches 

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2020-05-26 17:01:10 -04:00
parent 9cb5c87284
commit f8632bad82
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
endif endif
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay BUILDTAGS_CROSS ?= ABISupport containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
ifneq (,$(findstring varlink,$(BUILDTAGS))) ifneq (,$(findstring varlink,$(BUILDTAGS)))
PODMAN_VARLINK_DEPENDENCIES = pkg/varlink/iopodman.go PODMAN_VARLINK_DEPENDENCIES = pkg/varlink/iopodman.go
endif endif

2
pkg/api/handlers/compat/networks.go
View File

@ -123,7 +123,7 @@ func getNetworkResourceByName(name string, runtime *libpod.Runtime) (*types.Netw
report := types.NetworkResource{ report := types.NetworkResource{
Name: name, Name: name,
ID: "", ID: "",
Created: time.Unix(stat.Ctim.Sec, stat.Ctim.Nsec), Created: time.Unix(int64(stat.Ctim.Sec), int64(stat.Ctim.Nsec)), // nolint: unconvert
Scope: "", Scope: "",
Driver: network.DefaultNetworkDriver, Driver: network.DefaultNetworkDriver,
EnableIPv6: false, EnableIPv6: false,