summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-27 11:18:37 -0400
committerGitHub <noreply@github.com>2020-05-27 11:18:37 -0400
commitab3a620f74f2f1458054822f2113200863b60d40 (patch)
tree865f06d84a67ed862446b1d393dbf5ebb6213694
parent2a988a4d8279ac5d7e34fdaee18e6a9e120206d5 (diff)
parentf8632bad82629d5a918fbb163d67ef8bca96724f (diff)
downloadpodman-ab3a620f74f2f1458054822f2113200863b60d40.tar.gz
podman-ab3a620f74f2f1458054822f2113200863b60d40.tar.bz2
podman-ab3a620f74f2f1458054822f2113200863b60d40.zip
Merge pull request #6398 from rhatdan/32bit
Fix builds on 32 Arches.
-rw-r--r--Makefile2
-rw-r--r--pkg/api/handlers/compat/networks.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8fcc6cd82..680c60589 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
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)))
PODMAN_VARLINK_DEPENDENCIES = pkg/varlink/iopodman.go
endif
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index ceeae30fb..c52ca093f 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -123,7 +123,7 @@ func getNetworkResourceByName(name string, runtime *libpod.Runtime) (*types.Netw
report := types.NetworkResource{
Name: name,
ID: "",
- Created: time.Unix(stat.Ctim.Sec, stat.Ctim.Nsec),
+ Created: time.Unix(int64(stat.Ctim.Sec), int64(stat.Ctim.Nsec)), // nolint: unconvert
Scope: "",
Driver: network.DefaultNetworkDriver,
EnableIPv6: false,