Sat Sep 4 20:28:42 2021 UTC ()
Add podman 3.3.1
Podman (the POD MANager) is a tool for managing containers and
images, volumes mounted into those containers, and pods made from
groups of containers. Podman is based on libpod, a library for
container lifecycle management that is also contained in this
repository. The libpod library provides APIs for managing containers,
pods, container images, and volumes.
On operating systems other than Linux, it can spawn and talk to a
Linux virtual machine.
(maya)
diff -r1.965 -r1.966 pkgsrc/sysutils/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/podman/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/podman/MESSAGE.NetBSD
diff -r0 -r1.1 pkgsrc/sysutils/podman/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/podman/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/podman/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_init.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_list.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_machine.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_rm.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_ssh.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_start.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_machine_stop.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-cmd_podman_registry_config.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_config.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_connection.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_fcos.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_ignition__schema.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_keys.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_pull.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_config.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_machine.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__netbsd__amd64.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__netbsd.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-pkg_util_utils__supported.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__uint64.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_buildah_util_util__unix.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_util__supported.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_drivers_chroot__unix.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go
diff -r0 -r1.1 pkgsrc/sysutils/podman/patches/patch-vendor_github.com_moby_sys_mount_flags__bsd.go
--- pkgsrc/sysutils/Makefile 2021/08/30 23:46:34 1.965
+++ pkgsrc/sysutils/Makefile 2021/09/04 20:28:42 1.966
| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile,v 1.965 2021/08/30 23:46:34 jmcneill Exp $ | | 1 | # $NetBSD: Makefile,v 1.966 2021/09/04 20:28:42 maya Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | COMMENT= System utilities | | 4 | COMMENT= System utilities |
5 | | | 5 | |
6 | SUBDIR+= 855resolution | | 6 | SUBDIR+= 855resolution |
7 | SUBDIR+= 915resolution | | 7 | SUBDIR+= 915resolution |
8 | SUBDIR+= 9base | | 8 | SUBDIR+= 9base |
9 | SUBDIR+= R-later | | 9 | SUBDIR+= R-later |
10 | SUBDIR+= R-processx | | 10 | SUBDIR+= R-processx |
11 | SUBDIR+= R-progress | | 11 | SUBDIR+= R-progress |
12 | SUBDIR+= R-ps | | 12 | SUBDIR+= R-ps |
13 | SUBDIR+= R-sys | | 13 | SUBDIR+= R-sys |
14 | SUBDIR+= R-unix | | 14 | SUBDIR+= R-unix |
| @@ -508,26 +508,27 @@ SUBDIR+= p5-Unix-Syslog | | | @@ -508,26 +508,27 @@ SUBDIR+= p5-Unix-Syslog |
508 | SUBDIR+= p5-collectd | | 508 | SUBDIR+= p5-collectd |
509 | SUBDIR+= pciutils | | 509 | SUBDIR+= pciutils |
510 | SUBDIR+= pcmanfm | | 510 | SUBDIR+= pcmanfm |
511 | SUBDIR+= pcmanfm-qt | | 511 | SUBDIR+= pcmanfm-qt |
512 | SUBDIR+= pcvt-utils | | 512 | SUBDIR+= pcvt-utils |
513 | SUBDIR+= pdumpfs | | 513 | SUBDIR+= pdumpfs |
514 | SUBDIR+= pear-Log | | 514 | SUBDIR+= pear-Log |
515 | SUBDIR+= pfetch | | 515 | SUBDIR+= pfetch |
516 | SUBDIR+= pflogsumm | | 516 | SUBDIR+= pflogsumm |
517 | SUBDIR+= pfstat | | 517 | SUBDIR+= pfstat |
518 | SUBDIR+= pftop | | 518 | SUBDIR+= pftop |
519 | SUBDIR+= pidof | | 519 | SUBDIR+= pidof |
520 | SUBDIR+= pluged | | 520 | SUBDIR+= pluged |
| | | 521 | SUBDIR+= podman |
521 | SUBDIR+= polysh | | 522 | SUBDIR+= polysh |
522 | SUBDIR+= pscpug | | 523 | SUBDIR+= pscpug |
523 | SUBDIR+= psftools | | 524 | SUBDIR+= psftools |
524 | SUBDIR+= psmisc | | 525 | SUBDIR+= psmisc |
525 | SUBDIR+= pstree | | 526 | SUBDIR+= pstree |
526 | SUBDIR+= puppet | | 527 | SUBDIR+= puppet |
527 | SUBDIR+= pv | | 528 | SUBDIR+= pv |
528 | SUBDIR+= pwgen | | 529 | SUBDIR+= pwgen |
529 | SUBDIR+= py-Glances | | 530 | SUBDIR+= py-Glances |
530 | SUBDIR+= py-Send2Trash | | 531 | SUBDIR+= py-Send2Trash |
531 | SUBDIR+= py-appnope | | 532 | SUBDIR+= py-appnope |
532 | SUBDIR+= py-augeas | | 533 | SUBDIR+= py-augeas |
533 | SUBDIR+= py-borgbackup | | 534 | SUBDIR+= py-borgbackup |
Podman (the POD MANager) is a tool for managing containers and
images, volumes mounted into those containers, and pods made from
groups of containers. Podman is based on libpod, a library for
container lifecycle management that is also contained in this
repository. The libpod library provides APIs for managing containers,
pods, container images, and volumes.
On operating systems other than Linux, it can spawn and talk to a
Linux virtual machine.
===========================================================================
$NetBSD: MESSAGE.NetBSD,v 1.1 2021/09/04 20:28:42 maya Exp $
You will need to build a kernel with options HZ=1000, or edit the created
VM to append "noapic" to the Grub command line.
===========================================================================
# $NetBSD: Makefile,v 1.1 2021/09/04 20:28:42 maya Exp $
GITHUB_PROJECT= podman
GITHUB_TAG= refs/tags/v3.3.1
DISTNAME= v3.3.1
PKGNAME= ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=containers/}
DIST_SUBDIR= ${GITHUB_PROJECT}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/containers/podman/
COMMENT= Tool for managing OCI containers and pods
LICENSE= apache-2.0
WRKSRC= ${WRKDIR}/podman-3.3.1
USE_TOOLS+= gmake gsed
.include "../../mk/bsd.prefs.mk"
.include "../../lang/go/version.mk"
BUILD_DEPENDS+= ${GO_PACKAGE_DEP}
DEPENDS+= qemu-[0-9]*:../../emulators/qemu
DEPENDS+= gvproxy-[0-9]*:../../net/gvproxy
SUBST_CLASSES+= gvproxy
SUBST_FILES.gvproxy= pkg/machine/qemu/machine.go
SUBST_STAGE.gvproxy= pre-configure
SUBST_MESSAGE.gvproxy= fix PREFIX inside patch
SUBST_VARS.gvproxy= PREFIX
.if ${OPSYS} != "Linux"
BUILD_TARGET= podman-remote-${OPSYS:tl}
INSTALLATION_DIRS+= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS:tl}/podman ${DESTDIR}${PREFIX}/bin/podman
.endif
.include "../../mk/bsd.pkg.mk"
@comment $NetBSD: PLIST,v 1.1 2021/09/04 20:28:42 maya Exp $
bin/podman
$NetBSD: distinfo,v 1.1 2021/09/04 20:28:42 maya Exp $
SHA1 (podman/v3.3.1.tar.gz) = 658cf4a69ffe329a6c342dc209f4951738acc3b7
RMD160 (podman/v3.3.1.tar.gz) = 1e12b82c57db1c9b1af9bee15cd2eb61a8ffe700
SHA512 (podman/v3.3.1.tar.gz) = 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa
Size (podman/v3.3.1.tar.gz) = 10917305 bytes
SHA1 (patch-Makefile) = 5671f5452430d4b94af924defbb473eb91732281
SHA1 (patch-cmd_podman_machine_init.go) = 391b486723fc63120235e108b078e475c328dd15
SHA1 (patch-cmd_podman_machine_list.go) = 96007836194c66ed2e3e2bc271af7acf8e72fd9b
SHA1 (patch-cmd_podman_machine_machine.go) = 749fdc292f9a425d0ca0fc1cec5aac90cb7f2a66
SHA1 (patch-cmd_podman_machine_rm.go) = 0cbb65a1f2330185be6210936b7f1d0e82f26e2b
SHA1 (patch-cmd_podman_machine_ssh.go) = 1c6d996b1e996c9a0fbb973e785b88bc19651519
SHA1 (patch-cmd_podman_machine_start.go) = 9c4ae7fc106faab0d6e6ade73d0b07c2c024527e
SHA1 (patch-cmd_podman_machine_stop.go) = a5a17b271e78617caecd15e19ddb2094c17f95c0
SHA1 (patch-cmd_podman_registry_config.go) = 6d32a7526cad5728a385de0029b2bbe5474e7f1b
SHA1 (patch-pkg_machine_config.go) = 9432c84ac70623c209723705b472912fde55ba84
SHA1 (patch-pkg_machine_connection.go) = fac7ad8ec1110a0242f080201d5f3fbd683d0aa3
SHA1 (patch-pkg_machine_fcos.go) = 1f50d437689f664b1f5bc196e6dbd16f10710747
SHA1 (patch-pkg_machine_ignition.go) = 31cbf4b07aa2505317bfdb90a8157442e0fd68bb
SHA1 (patch-pkg_machine_ignition__schema.go) = 82b8ff2f06efd98fc0af4203de77b30fa5ede735
SHA1 (patch-pkg_machine_keys.go) = 8754a3bf3911dc30ce4c4a860062fefcee3e9c0a
SHA1 (patch-pkg_machine_pull.go) = 77aa437282992a6eac6c2472bc76f149c0dcb5a7
SHA1 (patch-pkg_machine_qemu_config.go) = aba88962e13027ec620a9a60326619a159c402d1
SHA1 (patch-pkg_machine_qemu_machine.go) = 4524c385e209179243df834388244e9d5ea219b8
SHA1 (patch-pkg_machine_qemu_options__netbsd.go) = a256dcafceb70f29b4f7a1ed013b52b5d6b0f4ba
SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 7f5e4fe206e6e1d8f8e2cd33c8ac18b614c2dd61
SHA1 (patch-pkg_util_utils__netbsd.go) = 452c7ca070a945cbcc3e703105c1fe0a65eaedc7
SHA1 (patch-pkg_util_utils__supported.go) = 61d8aa0987049dd212cc354429bb7086b2ba3e80
SHA1 (patch-vendor_github.com_containers_buildah_util_util__uint64.go) = 3e8b233c63224e5c2785760342bb42ec064a81a1
SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = 2073a132dc3bf63436ff29bcd228d960ab3c90d0
SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 0f045546a9d51f5f64c84392107429e627c3674a
SHA1 (patch-vendor_github.com_containers_common_pkg_config_util__supported.go) = 3e02f5ee7d0855d46d8318792f620e18f722d259
SHA1 (patch-vendor_github.com_containers_storage_drivers_chroot__unix.go) = c2c625898c7651d24ba842a6654d57dd4a0e4428
SHA1 (patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go) = c65adf43eca0ff10a289ae8f1fa09376164dc89e
SHA1 (patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go) = afe76698c46e8ae015e7128958336a80016a53b7
SHA1 (patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go) = 0d143dd2aaa21470bc31e260dc3413b2533208f9
SHA1 (patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go) = 37bae90c1b3d97f8b4166fca2c59d144c41f81f8
SHA1 (patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go) = ff256cc59025a279c613ad91d3d483cabfbbf8c8
SHA1 (patch-vendor_github.com_moby_sys_mount_flags__bsd.go) = 7261a1aee3334b7da676851851678a49a22559ae
$NetBSD: patch-Makefile,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support
--- Makefile.orig 2021-08-30 19:15:26.000000000 +0000
+++ Makefile
@@ -160,6 +160,9 @@ SRCBINDIR := bin/windows
else ifeq ($(GOOS),darwin)
BINSFX :=
SRCBINDIR := bin/darwin
+else ifeq ($(GOOS),netbsd)
+BINSFX :=
+SRCBINDIR := bin/netbsd
else
BINSFX := -remote
SRCBINDIR := bin
@@ -351,6 +354,13 @@ podman-remote-windows: ## Build podman-r
GOOS=windows \
bin/windows/podman.exe
+.PHONY: podman-remote-netbsd
+podman-remote-netbsd: ## Build podman-remote for NetBSD
+ $(MAKE) \
+ CGO_ENABLED=0 \
+ GOOS=netbsd \
+ bin/netbsd/podman
+
.PHONY: podman-remote-darwin
podman-remote-darwin: ## Build podman-remote for macOS
$(MAKE) \
$NetBSD: patch-cmd_podman_machine_init.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/init.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/init.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_list.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/list.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/list.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_machine.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/machine.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/machine.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_rm.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/rm.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/rm.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_ssh.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/ssh.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/ssh.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_start.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/start.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/start.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_machine_stop.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- cmd/podman/machine/stop.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/machine/stop.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-cmd_podman_registry_config.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support
--- cmd/podman/registry/config.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ cmd/podman/registry/config.go
@@ -54,7 +54,7 @@ func newPodmanConfig() {
var mode entities.EngineMode
switch runtime.GOOS {
- case "darwin", "windows":
+ case "darwin", "netbsd", "windows":
mode = entities.TunnelMode
case "linux":
// Some linux clients might only be compiled without ABI
$NetBSD: patch-pkg_machine_config.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/config.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/config.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_connection.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/connection.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/connection.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_fcos.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/fcos.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/fcos.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_ignition.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/ignition.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/ignition.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_ignition__schema.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/ignition_schema.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/ignition_schema.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_keys.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/keys.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/keys.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_pull.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/pull.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/pull.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package machine
$NetBSD: patch-pkg_machine_qemu_config.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/machine/qemu/config.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/qemu/config.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package qemu
$NetBSD: patch-pkg_machine_qemu_machine.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Use an expected path typical for pkgsrc.
--- pkg/machine/qemu/machine.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/machine/qemu/machine.go
@@ -1,4 +1,4 @@
-// +build amd64,linux arm64,linux amd64,darwin arm64,darwin
+// +build amd64,!windows arm64,!windows
package qemu
@@ -624,7 +624,7 @@ func (v *MachineVM) startHostNetworking(
binary, err := exec.LookPath(machine.ForwarderBinaryName)
if errors.Is(err, exec.ErrNotFound) {
// Nothing was found, so now check /usr/libexec, else error out
- binary = filepath.Join("/usr/libexec/podman/", machine.ForwarderBinaryName)
+ binary = filepath.Join("@PREFIX@/bin", machine.ForwarderBinaryName)
if _, err := os.Stat(binary); err != nil {
return err
}
$NetBSD: patch-pkg_machine_qemu_options__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support
--- pkg/machine/qemu/options_netbsd.go.orig 2021-09-04 13:34:34.955121865 +0000
+++ pkg/machine/qemu/options_netbsd.go
@@ -0,0 +1,13 @@
+package qemu
+
+import (
+ "os"
+)
+
+func getRuntimeDir() (string, error) {
+ tmpDir, ok := os.LookupEnv("TMPDIR")
+ if !ok {
+ tmpDir = "/tmp"
+ }
+ return tmpDir, nil
+}
$NetBSD: patch-pkg_machine_qemu_options__netbsd__amd64.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd/amd64 support - uses nvmm
--- pkg/machine/qemu/options_netbsd_amd64.go.orig 2021-09-04 12:43:04.031906656 +0000
+++ pkg/machine/qemu/options_netbsd_amd64.go
@@ -0,0 +1,20 @@
+package qemu
+
+var (
+ QemuCommand = "qemu-system-x86_64"
+)
+
+func (v *MachineVM) addArchOptions() []string {
+ opts := []string{
+ "-accel", "nvmm",
+ }
+ return opts
+}
+
+func (v *MachineVM) prepare() error {
+ return nil
+}
+
+func (v *MachineVM) archRemovalFiles() []string {
+ return []string{}
+}
$NetBSD: patch-pkg_util_utils__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support
--- pkg/util/utils_netbsd.go.orig 2021-09-04 12:43:04.032001543 +0000
+++ pkg/util/utils_netbsd.go
@@ -0,0 +1,9 @@
+package util
+
+import (
+ "github.com/pkg/errors"
+)
+
+func GetContainerPidInformationDescriptors() ([]string, error) {
+ return []string{}, errors.New("this function is not supported on darwin")
+}
$NetBSD: patch-pkg_util_utils__supported.go,v 1.1 2021/09/04 20:28:42 maya Exp $
https://github.com/containers/podman/pull/11434
--- pkg/util/utils_supported.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ pkg/util/utils_supported.go
@@ -1,4 +1,4 @@
-// +build linux darwin
+// +build !windows
package util
$NetBSD: patch-vendor_github.com_containers_buildah_util_util__uint64.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support
--- vendor/github.com/containers/buildah/util/util_uint64.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/buildah/util/util_uint64.go
@@ -1,4 +1,4 @@
-// +build linux,!mips,!mipsle,!mips64,!mips64le
+// +build linux,!mips,!mipsle,!mips64,!mips64le netbsd
package util
$NetBSD: patch-vendor_github.com_containers_buildah_util_util__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/buildah/util/util_unix.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/buildah/util/util_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin
+// +build !windows
package util
$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/common/pkg/config/config_netbsd.go.orig 2021-09-04 12:43:05.851513218 +0000
+++ vendor/github.com/containers/common/pkg/config/config_netbsd.go
@@ -0,0 +1,17 @@
+package config
+
+import (
+ "os"
+)
+
+// podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.
+func customConfigFile() (string, error) {
+ if path, found := os.LookupEnv("CONTAINERS_CONF"); found {
+ return path, nil
+ }
+ return rootlessConfigPath()
+}
+
+func ifRootlessConfigPath() (string, error) {
+ return rootlessConfigPath()
+}
$NetBSD: patch-vendor_github.com_containers_common_pkg_config_util__supported.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/common/pkg/config/util_supported.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/common/pkg/config/util_supported.go
@@ -1,4 +1,4 @@
-// +build linux darwin
+// +build linux darwin netbsd
package config
$NetBSD: patch-vendor_github.com_containers_storage_drivers_chroot__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/storage/drivers/chroot_unix.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/storage/drivers/chroot_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin freebsd solaris
+// +build !windows
package graphdriver
$NetBSD: patch-vendor_github.com_containers_storage_pkg_directory_directory__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/storage/pkg/directory/directory_unix.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/storage/pkg/directory/directory_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin freebsd solaris
+// +build !windows
package directory
$NetBSD: patch-vendor_github.com_containers_storage_pkg_homedir_homedir__others.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/storage/pkg/homedir/homedir_others.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/storage/pkg/homedir/homedir_others.go
@@ -1,4 +1,4 @@
-// +build !linux,!darwin,!freebsd
+// +build !linux,!darwin,!freebsd,!netbsd
package homedir
$NetBSD: patch-vendor_github.com_containers_storage_pkg_lockfile_lockfile__unix.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go
@@ -1,4 +1,4 @@
-// +build linux solaris darwin freebsd
+// +build linux solaris darwin freebsd netbsd
package lockfile
$NetBSD: patch-vendor_github.com_containers_storage_pkg_system_stat__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/containers/storage/pkg/system/stat_netbsd.go.orig 2021-09-04 12:43:05.852178601 +0000
+++ vendor/github.com/containers/storage/pkg/system/stat_netbsd.go
@@ -0,0 +1,13 @@
+package system
+
+import "syscall"
+
+// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
+func fromStatT(s *syscall.Stat_t) (*StatT, error) {
+ return &StatT{size: s.Size,
+ mode: uint32(s.Mode),
+ uid: s.Uid,
+ gid: s.Gid,
+ rdev: uint64(s.Rdev),
+ mtim: s.Mtimespec}, nil
+}
$NetBSD: patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__netbsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
Taken from openbsd example.
--- vendor/github.com/godbus/dbus/v5/transport_unixcred_netbsd.go.orig 2021-09-04 12:43:05.852290581 +0000
+++ vendor/github.com/godbus/dbus/v5/transport_unixcred_netbsd.go
@@ -0,0 +1,14 @@
+package dbus
+
+import "io"
+
+func (t *unixTransport) SendNullByte() error {
+ n, _, err := t.UnixConn.WriteMsgUnix([]byte{0}, nil, nil)
+ if err != nil {
+ return err
+ }
+ if n != 1 {
+ return io.ErrShortWrite
+ }
+ return nil
+}
$NetBSD: patch-vendor_github.com_moby_sys_mount_flags__bsd.go,v 1.1 2021/09/04 20:28:42 maya Exp $
Add netbsd support (vendor code)
--- vendor/github.com/moby/sys/mount/flags_bsd.go.orig 2021-08-30 19:15:26.000000000 +0000
+++ vendor/github.com/moby/sys/mount/flags_bsd.go
@@ -1,4 +1,4 @@
-// +build freebsd openbsd
+// +build freebsd openbsd netbsd
package mount