From 3279342ffea75d32756ba8da4b1b6ed723033579 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Fri, 14 Oct 2022 14:34:50 +0100 Subject: [PATCH 1/3] pkg/rctl: Remove unused cgo dependency The cross build targets build without cgo. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- pkg/rctl/rctl.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/rctl/rctl.go b/pkg/rctl/rctl.go index 135cc60cb1..dccf9e7cd5 100644 --- a/pkg/rctl/rctl.go +++ b/pkg/rctl/rctl.go @@ -3,9 +3,6 @@ package rctl -// #include -import "C" - import ( "bytes" "fmt" From e23444fbc59d5296433bbe2159163aa7c717189b Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Mon, 31 Oct 2022 15:11:31 +0000 Subject: [PATCH 2/3] pkg/machine: Make this build on FreeBSD/arm64 [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- pkg/machine/qemu/options_freebsd_arm64.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pkg/machine/qemu/options_freebsd_arm64.go diff --git a/pkg/machine/qemu/options_freebsd_arm64.go b/pkg/machine/qemu/options_freebsd_arm64.go new file mode 100644 index 0000000000..9a222190c8 --- /dev/null +++ b/pkg/machine/qemu/options_freebsd_arm64.go @@ -0,0 +1,21 @@ +package qemu + +var ( + QemuCommand = "qemu-system-aarch64" +) + +func (v *MachineVM) addArchOptions() []string { + opts := []string{ + "-machine", "virt", + "-accel", "tcg", + "-cpu", "host"} + return opts +} + +func (v *MachineVM) prepare() error { + return nil +} + +func (v *MachineVM) archRemovalFiles() []string { + return []string{} +} From fc65d72c3c3c2eb1c44f183a09e7e109d34698bb Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Wed, 17 Aug 2022 15:07:35 +0100 Subject: [PATCH 3/3] Makefile: Add cross build targets for freebsd This adds FreeBSD/amd64 and FreeBSD/arm64 to the cross build list. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7835e0eb4f..01e76fd661 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,9 @@ CROSS_BUILD_TARGETS := \ bin/podman.cross.linux.mips \ bin/podman.cross.linux.mipsle \ bin/podman.cross.linux.mips64 \ - bin/podman.cross.linux.mips64le + bin/podman.cross.linux.mips64le \ + bin/podman.cross.freebsd.amd64 \ + bin/podman.cross.freebsd.arm64 # Dereference variable $(1), return value if non-empty, otherwise raise an error. err_if_empty = $(if $(strip $($(1))),$(strip $($(1))),$(error Required variable $(1) value is undefined, whitespace, or empty))