From bad25da92e14cf36377b26a7a72c81ccd5122e0d Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Tue, 24 Oct 2023 12:11:34 +0200
Subject: [PATCH] libpod: add !remote tag

This should never be pulled into the remote client.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 libpod/boltdb_state.go                                  | 3 +++
 libpod/boltdb_state_internal.go                         | 3 +++
 libpod/common_test.go                                   | 3 +++
 libpod/container.go                                     | 3 +++
 libpod/container_api.go                                 | 3 +++
 libpod/container_commit.go                              | 3 +++
 libpod/container_config.go                              | 3 +++
 libpod/container_copy_common.go                         | 3 ++-
 libpod/container_copy_freebsd.go                        | 3 +++
 libpod/container_copy_linux.go                          | 3 +++
 libpod/container_exec.go                                | 3 +++
 libpod/container_freebsd.go                             | 4 ++--
 libpod/container_graph.go                               | 3 +++
 libpod/container_graph_test.go                          | 3 +++
 libpod/container_inspect.go                             | 3 +++
 libpod/container_inspect_freebsd.go                     | 3 +++
 libpod/container_inspect_linux.go                       | 3 +++
 libpod/container_internal.go                            | 3 +++
 libpod/container_internal_common.go                     | 3 ++-
 libpod/container_internal_freebsd.go                    | 4 ++--
 libpod/container_internal_linux.go                      | 4 ++--
 libpod/container_internal_linux_test.go                 | 4 ++--
 libpod/container_internal_test.go                       | 3 +++
 libpod/container_linux.go                               | 4 ++--
 libpod/container_log.go                                 | 3 +++
 libpod/container_log_linux.go                           | 4 ++--
 libpod/container_log_unsupported.go                     | 3 ++-
 libpod/container_path_resolution.go                     | 3 +++
 libpod/container_path_resolution_test.go                | 3 +++
 libpod/container_stat_common.go                         | 3 ++-
 libpod/container_stat_freebsd.go                        | 3 +++
 libpod/container_stat_linux.go                          | 3 +++
 libpod/container_top_freebsd.go                         | 4 ++--
 libpod/container_top_linux.c                            | 3 +++
 libpod/container_top_linux.go                           | 4 ++--
 libpod/container_top_unsupported.go                     | 3 ++-
 libpod/container_validate.go                            | 3 +++
 libpod/diff.go                                          | 3 +++
 libpod/events.go                                        | 3 +++
 libpod/healthcheck.go                                   | 3 +++
 libpod/healthcheck_linux.go                             | 4 ++--
 libpod/healthcheck_nosystemd_linux.go                   | 4 ++--
 libpod/healthcheck_unsupported.go                       | 4 ++--
 libpod/info.go                                          | 3 +++
 libpod/info_freebsd.go                                  | 3 +++
 libpod/info_linux.go                                    | 3 +++
 libpod/info_test.go                                     | 4 ++--
 libpod/kube.go                                          | 3 +++
 libpod/mounts_linux.go                                  | 4 ++--
 libpod/networking_common.go                             | 3 ++-
 libpod/networking_freebsd.go                            | 4 ++--
 libpod/networking_linux.go                              | 4 ++--
 libpod/networking_linux_test.go                         | 3 +++
 libpod/networking_machine.go                            | 3 +++
 libpod/networking_pasta_linux.go                        | 3 +++
 libpod/networking_slirp4netns.go                        | 4 ++--
 libpod/oci.go                                           | 3 +++
 libpod/oci_conmon.go                                    | 3 +++
 libpod/oci_conmon_attach_common.go                      | 3 ++-
 libpod/oci_conmon_attach_freebsd.go                     | 3 +++
 libpod/oci_conmon_attach_linux.go                       | 3 +++
 libpod/oci_conmon_common.go                             | 3 ++-
 libpod/oci_conmon_exec_common.go                        | 4 ++++
 libpod/oci_conmon_exec_freebsd.go                       | 3 +++
 libpod/oci_conmon_exec_linux.go                         | 3 +++
 libpod/oci_conmon_freebsd.go                            | 3 +++
 libpod/oci_conmon_linux.go                              | 3 +++
 libpod/oci_missing.go                                   | 3 +++
 libpod/oci_util.go                                      | 3 +++
 libpod/options.go                                       | 3 +++
 libpod/pod.go                                           | 3 +++
 libpod/pod_api.go                                       | 3 +++
 libpod/pod_internal.go                                  | 3 +++
 libpod/pod_internal_freebsd.go                          | 3 +++
 libpod/pod_internal_linux.go                            | 3 +++
 libpod/pod_status.go                                    | 3 +++
 libpod/pod_top_freebsd.go                               | 4 ++--
 libpod/pod_top_linux.go                                 | 4 ++--
 libpod/reset.go                                         | 3 +++
 libpod/rlimit_int64.go                                  | 4 ++--
 libpod/rlimit_uint64.go                                 | 4 ++--
 libpod/runtime.go                                       | 3 +++
 libpod/runtime_cstorage.go                              | 3 +++
 libpod/runtime_ctr.go                                   | 3 +++
 libpod/runtime_ctr_freebsd.go                           | 3 +++
 libpod/runtime_ctr_linux.go                             | 3 +++
 libpod/runtime_img.go                                   | 3 +++
 libpod/{runtime_migrate.go => runtime_migrate_linux.go} | 4 ++--
 libpod/runtime_migrate_unsupported.go                   | 4 ++--
 libpod/runtime_pod.go                                   | 3 +++
 libpod/runtime_pod_common.go                            | 3 ++-
 libpod/runtime_pod_freebsd.go                           | 3 +++
 libpod/runtime_pod_linux.go                             | 3 +++
 libpod/runtime_pre_go1.20.go                            | 4 ++--
 libpod/runtime_renumber.go                              | 3 +++
 libpod/runtime_test.go                                  | 3 +++
 libpod/runtime_volume.go                                | 3 +++
 libpod/runtime_volume_common.go                         | 3 ++-
 libpod/runtime_worker.go                                | 3 +++
 libpod/service.go                                       | 3 +++
 libpod/sqlite_state.go                                  | 3 +++
 libpod/sqlite_state_internal.go                         | 3 +++
 libpod/state.go                                         | 3 +++
 libpod/state_test.go                                    | 3 +++
 libpod/stats_common.go                                  | 3 ++-
 libpod/stats_freebsd.go                                 | 3 +++
 libpod/stats_linux.go                                   | 4 ++--
 libpod/storage.go                                       | 3 +++
 libpod/util.go                                          | 3 +++
 libpod/util_freebsd.go                                  | 4 ++--
 libpod/util_linux.go                                    | 4 ++--
 libpod/util_linux_test.go                               | 3 +++
 libpod/util_test.go                                     | 3 +++
 libpod/volume.go                                        | 3 +++
 libpod/volume_inspect.go                                | 3 +++
 libpod/volume_internal.go                               | 3 +++
 libpod/volume_internal_common.go                        | 3 ++-
 libpod/volume_internal_freebsd.go                       | 3 +++
 libpod/volume_internal_linux.go                         | 3 +++
 119 files changed, 320 insertions(+), 64 deletions(-)
 rename libpod/{runtime_migrate.go => runtime_migrate_linux.go} (98%)

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index f1888b6a18..a2740b289f 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go
index 90420cc687..388110f251 100644
--- a/libpod/boltdb_state_internal.go
+++ b/libpod/boltdb_state_internal.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/common_test.go b/libpod/common_test.go
index 61bba031e6..ed6577f9f0 100644
--- a/libpod/common_test.go
+++ b/libpod/common_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container.go b/libpod/container.go
index 7c54a1519b..ddb2c1b105 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 337ff7c39d..b0e06566df 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_commit.go b/libpod/container_commit.go
index d4db1e447b..00063c2c28 100644
--- a/libpod/container_commit.go
+++ b/libpod/container_commit.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_config.go b/libpod/container_config.go
index e0ab5c5e97..aefce67219 100644
--- a/libpod/container_config.go
+++ b/libpod/container_config.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go
index d07b4c6928..c8156a6302 100644
--- a/libpod/container_copy_common.go
+++ b/libpod/container_copy_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/container_copy_freebsd.go b/libpod/container_copy_freebsd.go
index 218f3917f7..d19acc23a6 100644
--- a/libpod/container_copy_freebsd.go
+++ b/libpod/container_copy_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 // On FreeBSD, the container's mounts are in the global mount
diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go
index 3b029f08f6..9096be810f 100644
--- a/libpod/container_copy_linux.go
+++ b/libpod/container_copy_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index c7b1a93338..df52993c19 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_freebsd.go b/libpod/container_freebsd.go
index cb0a465b23..7164eefd86 100644
--- a/libpod/container_freebsd.go
+++ b/libpod/container_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_graph.go b/libpod/container_graph.go
index b508c66b86..6fae1c29a0 100644
--- a/libpod/container_graph.go
+++ b/libpod/container_graph.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go
index 7a265ecae3..665f055275 100644
--- a/libpod/container_graph_test.go
+++ b/libpod/container_graph_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index bb6fc7f543..d968fa00b1 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go
index 8b4e8df871..b0f8bae544 100644
--- a/libpod/container_inspect_freebsd.go
+++ b/libpod/container_inspect_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go
index 53fb04034b..b0f11ea6f2 100644
--- a/libpod/container_inspect_linux.go
+++ b/libpod/container_inspect_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index d6079df00a..00510d88ab 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go
index 15485efa40..b702a86b2e 100644
--- a/libpod/container_internal_common.go
+++ b/libpod/container_internal_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go
index fe3d238d75..f4a3b9a855 100644
--- a/libpod/container_internal_freebsd.go
+++ b/libpod/container_internal_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 2a9bb9f86a..f96d1a8d9e 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_internal_linux_test.go b/libpod/container_internal_linux_test.go
index 4054232f31..850ad57e6a 100644
--- a/libpod/container_internal_linux_test.go
+++ b/libpod/container_internal_linux_test.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go
index 4fb95e95e4..9f6b504cdc 100644
--- a/libpod/container_internal_test.go
+++ b/libpod/container_internal_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_linux.go b/libpod/container_linux.go
index a1a64f5dda..8ff47f461f 100644
--- a/libpod/container_linux.go
+++ b/libpod/container_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_log.go b/libpod/container_log.go
index 5d399b7129..55043456ff 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
index a708ad46da..c3564fbf27 100644
--- a/libpod/container_log_linux.go
+++ b/libpod/container_log_linux.go
@@ -1,5 +1,5 @@
-//go:build linux && systemd
-// +build linux,systemd
+//go:build !remote && linux && systemd
+// +build !remote,linux,systemd
 
 package libpod
 
diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go
index d524561f42..6f89f4612d 100644
--- a/libpod/container_log_unsupported.go
+++ b/libpod/container_log_unsupported.go
@@ -1,4 +1,5 @@
-//go:build !linux || !systemd
+//go:build !remote && (!linux || !systemd)
+// +build !remote
 // +build !linux !systemd
 
 package libpod
diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go
index af9c3277e6..4148379977 100644
--- a/libpod/container_path_resolution.go
+++ b/libpod/container_path_resolution.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_path_resolution_test.go b/libpod/container_path_resolution_test.go
index f906c752d2..38e60ed603 100644
--- a/libpod/container_path_resolution_test.go
+++ b/libpod/container_path_resolution_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go
index c70098cf51..b2e7eacd79 100644
--- a/libpod/container_stat_common.go
+++ b/libpod/container_stat_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/container_stat_freebsd.go b/libpod/container_stat_freebsd.go
index d1e0db3482..24288d7984 100644
--- a/libpod/container_stat_freebsd.go
+++ b/libpod/container_stat_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go
index 5e5ef3c1af..ef0e88c322 100644
--- a/libpod/container_stat_linux.go
+++ b/libpod/container_stat_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/container_top_freebsd.go b/libpod/container_top_freebsd.go
index 0ca26fab40..801814bb60 100644
--- a/libpod/container_top_freebsd.go
+++ b/libpod/container_top_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/container_top_linux.c b/libpod/container_top_linux.c
index 566425b6fa..735becc640 100644
--- a/libpod/container_top_linux.c
+++ b/libpod/container_top_linux.c
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 #define _GNU_SOURCE
 #include <errno.h>
 #include <stdio.h>
diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go
index 41002eb527..85cec315e7 100644
--- a/libpod/container_top_linux.go
+++ b/libpod/container_top_linux.go
@@ -1,5 +1,5 @@
-//go:build linux && cgo
-// +build linux,cgo
+//go:build !remote && linux && cgo
+// +build !remote,linux,cgo
 
 package libpod
 
diff --git a/libpod/container_top_unsupported.go b/libpod/container_top_unsupported.go
index 3d7d7e3192..66fd66887a 100644
--- a/libpod/container_top_unsupported.go
+++ b/libpod/container_top_unsupported.go
@@ -1,4 +1,5 @@
-//go:build !(linux && cgo) && !freebsd
+//go:build !remote && !(linux && cgo) && !freebsd
+// +build !remote
 // +build !linux !cgo
 // +build !freebsd
 
diff --git a/libpod/container_validate.go b/libpod/container_validate.go
index caa633d432..e01d8ef098 100644
--- a/libpod/container_validate.go
+++ b/libpod/container_validate.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/diff.go b/libpod/diff.go
index 8f0ad93555..906329d78a 100644
--- a/libpod/diff.go
+++ b/libpod/diff.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/events.go b/libpod/events.go
index 7d148b86dd..6e8c409e3a 100644
--- a/libpod/events.go
+++ b/libpod/events.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go
index d069e171a2..f906562bc9 100644
--- a/libpod/healthcheck.go
+++ b/libpod/healthcheck.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go
index 04268e5eec..53ec0c1dee 100644
--- a/libpod/healthcheck_linux.go
+++ b/libpod/healthcheck_linux.go
@@ -1,5 +1,5 @@
-//go:build systemd
-// +build systemd
+//go:build !remote && systemd
+// +build !remote,systemd
 
 package libpod
 
diff --git a/libpod/healthcheck_nosystemd_linux.go b/libpod/healthcheck_nosystemd_linux.go
index 2e3b15dcff..cde5f0c10f 100644
--- a/libpod/healthcheck_nosystemd_linux.go
+++ b/libpod/healthcheck_nosystemd_linux.go
@@ -1,5 +1,5 @@
-//go:build !systemd
-// +build !systemd
+//go:build !remote && !systemd
+// +build !remote,!systemd
 
 package libpod
 
diff --git a/libpod/healthcheck_unsupported.go b/libpod/healthcheck_unsupported.go
index c6ba52ea7d..5e2c151f42 100644
--- a/libpod/healthcheck_unsupported.go
+++ b/libpod/healthcheck_unsupported.go
@@ -1,5 +1,5 @@
-//go:build !linux
-// +build !linux
+//go:build !remote && !linux
+// +build !remote,!linux
 
 package libpod
 
diff --git a/libpod/info.go b/libpod/info.go
index 82e9ab8a5a..b91f8780b2 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go
index 1be988350c..19b4257e37 100644
--- a/libpod/info_freebsd.go
+++ b/libpod/info_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/info_linux.go b/libpod/info_linux.go
index 55ca37d30f..4ede6a050c 100644
--- a/libpod/info_linux.go
+++ b/libpod/info_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/info_test.go b/libpod/info_test.go
index 1fe49c175a..c8c217a3f1 100644
--- a/libpod/info_test.go
+++ b/libpod/info_test.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote && linux
+// +build !remote,linux
 
 package libpod
 
diff --git a/libpod/kube.go b/libpod/kube.go
index 48b536071d..6338e14c4d 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/mounts_linux.go b/libpod/mounts_linux.go
index f6945b3a36..a30136f8a3 100644
--- a/libpod/mounts_linux.go
+++ b/libpod/mounts_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/networking_common.go b/libpod/networking_common.go
index c6f4390c44..d7bd84fe0a 100644
--- a/libpod/networking_common.go
+++ b/libpod/networking_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go
index bf817a75f1..75cb4fc80d 100644
--- a/libpod/networking_freebsd.go
+++ b/libpod/networking_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index d2c9def0e5..601d9a49bf 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go
index 2aeb1a02c5..9f751ab7e3 100644
--- a/libpod/networking_linux_test.go
+++ b/libpod/networking_linux_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/networking_machine.go b/libpod/networking_machine.go
index dce335c0a7..5fb8986a31 100644
--- a/libpod/networking_machine.go
+++ b/libpod/networking_machine.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/networking_pasta_linux.go b/libpod/networking_pasta_linux.go
index 288335ce94..905810a0f7 100644
--- a/libpod/networking_pasta_linux.go
+++ b/libpod/networking_pasta_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 // SPDX-License-Identifier: Apache-2.0
 //
 // networking_pasta_linux.go - Start pasta(1) for user-mode connectivity
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go
index 664b73d391..e8eaa76820 100644
--- a/libpod/networking_slirp4netns.go
+++ b/libpod/networking_slirp4netns.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote && linux
+// +build !remote,linux
 
 package libpod
 
diff --git a/libpod/oci.go b/libpod/oci.go
index 30fb43b905..8b55e58adc 100644
--- a/libpod/oci.go
+++ b/libpod/oci.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon.go b/libpod/oci_conmon.go
index 74060b3579..a31df444ae 100644
--- a/libpod/oci_conmon.go
+++ b/libpod/oci_conmon.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 const (
diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go
index 39ad274958..396e079dd6 100644
--- a/libpod/oci_conmon_attach_common.go
+++ b/libpod/oci_conmon_attach_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/oci_conmon_attach_freebsd.go b/libpod/oci_conmon_attach_freebsd.go
index de00543814..38ea56662d 100644
--- a/libpod/oci_conmon_attach_freebsd.go
+++ b/libpod/oci_conmon_attach_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_attach_linux.go b/libpod/oci_conmon_attach_linux.go
index f1aa89d3e9..242cd46722 100644
--- a/libpod/oci_conmon_attach_linux.go
+++ b/libpod/oci_conmon_attach_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go
index c02b3bf6e9..557eb878de 100644
--- a/libpod/oci_conmon_common.go
+++ b/libpod/oci_conmon_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go
index 88e24233bd..b44dbe0efa 100644
--- a/libpod/oci_conmon_exec_common.go
+++ b/libpod/oci_conmon_exec_common.go
@@ -1,3 +1,7 @@
+//go:build !remote && (linux || freebsd)
+// +build !remote
+// +build linux freebsd
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_exec_freebsd.go b/libpod/oci_conmon_exec_freebsd.go
index bf30404a19..baf3ac4e44 100644
--- a/libpod/oci_conmon_exec_freebsd.go
+++ b/libpod/oci_conmon_exec_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go
index 617e8d6015..8ef0d996c3 100644
--- a/libpod/oci_conmon_exec_linux.go
+++ b/libpod/oci_conmon_exec_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_freebsd.go b/libpod/oci_conmon_freebsd.go
index d74f2af015..e8cf6085a0 100644
--- a/libpod/oci_conmon_freebsd.go
+++ b/libpod/oci_conmon_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index a3a552bc64..527dea8370 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go
index bbf2957ff7..eedb5c6c6c 100644
--- a/libpod/oci_missing.go
+++ b/libpod/oci_missing.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/oci_util.go b/libpod/oci_util.go
index e118348fa3..981174561d 100644
--- a/libpod/oci_util.go
+++ b/libpod/oci_util.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/options.go b/libpod/options.go
index cd5af912a0..ffead43b4e 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/pod.go b/libpod/pod.go
index 0d4a591c2f..c83dba75ae 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
index 8c6e4cb6b4..c5bab8c2d7 100644
--- a/libpod/pod_api.go
+++ b/libpod/pod_api.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go
index 50ef1f6d4a..7554705d24 100644
--- a/libpod/pod_internal.go
+++ b/libpod/pod_internal.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/pod_internal_freebsd.go b/libpod/pod_internal_freebsd.go
index 48f6e2bcf8..d8c1111d91 100644
--- a/libpod/pod_internal_freebsd.go
+++ b/libpod/pod_internal_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 func (p *Pod) platformRefresh() error {
diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go
index ef7fefa41b..e8710d5b1b 100644
--- a/libpod/pod_internal_linux.go
+++ b/libpod/pod_internal_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/pod_status.go b/libpod/pod_status.go
index aabdfe50ef..1b4767b25b 100644
--- a/libpod/pod_status.go
+++ b/libpod/pod_status.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import "github.com/containers/podman/v4/libpod/define"
diff --git a/libpod/pod_top_freebsd.go b/libpod/pod_top_freebsd.go
index da7935bd56..902e369a7e 100644
--- a/libpod/pod_top_freebsd.go
+++ b/libpod/pod_top_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go
index 544126dcda..a800494182 100644
--- a/libpod/pod_top_linux.go
+++ b/libpod/pod_top_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/reset.go b/libpod/reset.go
index 6ed38df1d8..8833eb94b2 100644
--- a/libpod/reset.go
+++ b/libpod/reset.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/rlimit_int64.go b/libpod/rlimit_int64.go
index bff3e76f98..23dbc50662 100644
--- a/libpod/rlimit_int64.go
+++ b/libpod/rlimit_int64.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote && freebsd
+// +build !remote,freebsd
 
 package libpod
 
diff --git a/libpod/rlimit_uint64.go b/libpod/rlimit_uint64.go
index ab2e5d2d02..d446b46510 100644
--- a/libpod/rlimit_uint64.go
+++ b/libpod/rlimit_uint64.go
@@ -1,5 +1,5 @@
-//go:build linux || darwin
-// +build linux darwin
+//go:build !remote && linux
+// +build !remote,linux
 
 package libpod
 
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 27e2e05dfe..8af1864843 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go
index 5917b79314..86b6d065d4 100644
--- a/libpod/runtime_cstorage.go
+++ b/libpod/runtime_cstorage.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 909d6d0ff7..9b13de5af5 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_ctr_freebsd.go b/libpod/runtime_ctr_freebsd.go
index a8870a38c6..0f6f1b0256 100644
--- a/libpod/runtime_ctr_freebsd.go
+++ b/libpod/runtime_ctr_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 const (
diff --git a/libpod/runtime_ctr_linux.go b/libpod/runtime_ctr_linux.go
index 7812d8238e..09082febad 100644
--- a/libpod/runtime_ctr_linux.go
+++ b/libpod/runtime_ctr_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 const (
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index c1bec6d22b..c07e8cbaa7 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate_linux.go
similarity index 98%
rename from libpod/runtime_migrate.go
rename to libpod/runtime_migrate_linux.go
index 4764271845..717b123baa 100644
--- a/libpod/runtime_migrate.go
+++ b/libpod/runtime_migrate_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/runtime_migrate_unsupported.go b/libpod/runtime_migrate_unsupported.go
index 77c2737a9b..0a1b0b9fdc 100644
--- a/libpod/runtime_migrate_unsupported.go
+++ b/libpod/runtime_migrate_unsupported.go
@@ -1,5 +1,5 @@
-//go:build !linux
-// +build !linux
+//go:build !remote && !linux
+// +build !remote,!linux
 
 package libpod
 
diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go
index de840afeb0..3fe88268de 100644
--- a/libpod/runtime_pod.go
+++ b/libpod/runtime_pod.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go
index a4cc0f6bdf..5d6f95dab4 100644
--- a/libpod/runtime_pod_common.go
+++ b/libpod/runtime_pod_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/runtime_pod_freebsd.go b/libpod/runtime_pod_freebsd.go
index 7ec9bf026a..58647250f3 100644
--- a/libpod/runtime_pod_freebsd.go
+++ b/libpod/runtime_pod_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index 9d4a8641a3..010a27c3aa 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_pre_go1.20.go b/libpod/runtime_pre_go1.20.go
index 1c73043de4..3dcbe1808a 100644
--- a/libpod/runtime_pre_go1.20.go
+++ b/libpod/runtime_pre_go1.20.go
@@ -1,7 +1,7 @@
 // In go 1.20 and later, the global RNG is automatically initialized.
 // Ref: https://pkg.go.dev/math/rand@go1.20#Seed
-//go:build !go1.20
-// +build !go1.20
+//go:build !go1.20 && !remote
+// +build !go1.20,!remote
 
 package libpod
 
diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go
index f75e0e3e04..d4eaddaf25 100644
--- a/libpod/runtime_renumber.go
+++ b/libpod/runtime_renumber.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_test.go b/libpod/runtime_test.go
index 7468d34938..3e21f10484 100644
--- a/libpod/runtime_test.go
+++ b/libpod/runtime_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go
index 9efb30e037..292432b7bb 100644
--- a/libpod/runtime_volume.go
+++ b/libpod/runtime_volume.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go
index c74a0f32a3..1be52b2294 100644
--- a/libpod/runtime_volume_common.go
+++ b/libpod/runtime_volume_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/runtime_worker.go b/libpod/runtime_worker.go
index 9d41321b28..0851d74a91 100644
--- a/libpod/runtime_worker.go
+++ b/libpod/runtime_worker.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 func (r *Runtime) startWorker() {
diff --git a/libpod/service.go b/libpod/service.go
index a4b66eae9f..fdc5f048e8 100644
--- a/libpod/service.go
+++ b/libpod/service.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go
index 8643764a5d..9c88eb4e9c 100644
--- a/libpod/sqlite_state.go
+++ b/libpod/sqlite_state.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go
index 1aa39cbe1a..1f2c88dee7 100644
--- a/libpod/sqlite_state_internal.go
+++ b/libpod/sqlite_state_internal.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/state.go b/libpod/state.go
index 1e7a973834..b84ee06d53 100644
--- a/libpod/state.go
+++ b/libpod/state.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import "github.com/containers/common/libnetwork/types"
diff --git a/libpod/state_test.go b/libpod/state_test.go
index 9baed3ebe0..b0558a4782 100644
--- a/libpod/state_test.go
+++ b/libpod/state_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/stats_common.go b/libpod/stats_common.go
index 402bff4336..280aa0606d 100644
--- a/libpod/stats_common.go
+++ b/libpod/stats_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go
index 14f367d8a0..9e8a09aefd 100644
--- a/libpod/stats_freebsd.go
+++ b/libpod/stats_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go
index 5d09c3524e..1254e4867d 100644
--- a/libpod/stats_linux.go
+++ b/libpod/stats_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/storage.go b/libpod/storage.go
index 3d5e7ddcc2..9d7bbafa3f 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/util.go b/libpod/util.go
index 4069e31cd0..ed7c1260f6 100644
--- a/libpod/util.go
+++ b/libpod/util.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/util_freebsd.go b/libpod/util_freebsd.go
index a6942fc9f2..20914b5316 100644
--- a/libpod/util_freebsd.go
+++ b/libpod/util_freebsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd
-// +build freebsd
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/util_linux.go b/libpod/util_linux.go
index 7f6e1472c6..14a4ff119e 100644
--- a/libpod/util_linux.go
+++ b/libpod/util_linux.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !remote
+// +build !remote
 
 package libpod
 
diff --git a/libpod/util_linux_test.go b/libpod/util_linux_test.go
index 455fb84315..b8766983ef 100644
--- a/libpod/util_linux_test.go
+++ b/libpod/util_linux_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/util_test.go b/libpod/util_test.go
index dc3b8e6730..75ff1d5c8e 100644
--- a/libpod/util_test.go
+++ b/libpod/util_test.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/volume.go b/libpod/volume.go
index 9f08031548..0d8a179632 100644
--- a/libpod/volume.go
+++ b/libpod/volume.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go
index e2300da471..9916349140 100644
--- a/libpod/volume_inspect.go
+++ b/libpod/volume_inspect.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go
index 0daa24f826..7b86c22924 100644
--- a/libpod/volume_internal.go
+++ b/libpod/volume_internal.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go
index 199059cc4c..06c9dd53a1 100644
--- a/libpod/volume_internal_common.go
+++ b/libpod/volume_internal_common.go
@@ -1,4 +1,5 @@
-//go:build linux || freebsd
+//go:build !remote && (linux || freebsd)
+// +build !remote
 // +build linux freebsd
 
 package libpod
diff --git a/libpod/volume_internal_freebsd.go b/libpod/volume_internal_freebsd.go
index cf71f1e320..d0d9df77ed 100644
--- a/libpod/volume_internal_freebsd.go
+++ b/libpod/volume_internal_freebsd.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (
diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go
index eb4309dc31..e21fd97a38 100644
--- a/libpod/volume_internal_linux.go
+++ b/libpod/volume_internal_linux.go
@@ -1,3 +1,6 @@
+//go:build !remote
+// +build !remote
+
 package libpod
 
 import (