Received: by mail.netbsd.org (Postfix, from userid 605) id 079FF84E57; Sun, 6 Nov 2022 12:39:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 35D2284D72 for ; Sun, 6 Nov 2022 12:39:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DEo381VDPHBk for ; Sun, 6 Nov 2022 12:39:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4C18D84CD9 for ; Sun, 6 Nov 2022 12:39:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F8FCFA90; Sun, 6 Nov 2022 12:39:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1667738355172750" MIME-Version: 1.0 Date: Sun, 6 Nov 2022 12:39:15 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/sysutils/podman To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20221106123915.3F8FCFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1667738355172750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Nov 6 12:39:15 UTC 2022 Modified Files: pkgsrc/sysutils/podman: Makefile distinfo Added Files: pkgsrc/sysutils/podman/patches: patch-pkg_machine_qemu_options__darwin__arm64.go patch-vendor_github.com_containers_common_pkg_config_config__darwin.go Log Message: podman: fix machine startup on macOS/aarch64 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/podman/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/podman/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__darwin__arm64.go \ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1667738355172750 Content-Disposition: inline Content-Length: 5196 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/podman/Makefile diff -u pkgsrc/sysutils/podman/Makefile:1.4 pkgsrc/sysutils/podman/Makefile:1.5 --- pkgsrc/sysutils/podman/Makefile:1.4 Sun Jan 9 02:58:52 2022 +++ pkgsrc/sysutils/podman/Makefile Sun Nov 6 12:39:14 2022 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2022/01/09 02:58:52 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2022/11/06 12:39:14 tnn Exp $ DISTNAME= podman-3.4.4 +PKGREVISION= 1 GITHUB_TAG= v${PKGVERSION_NOREV} CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=containers/} @@ -19,11 +20,13 @@ BUILD_DEPENDS+= ${GO_PACKAGE_DEP} DEPENDS+= qemu-[0-9]*:../../emulators/qemu DEPENDS+= gvproxy-[0-9]*:../../net/gvproxy -SUBST_CLASSES+= gvproxy -SUBST_FILES.gvproxy= vendor/github.com/containers/common/pkg/config/config_netbsd.go -SUBST_STAGE.gvproxy= pre-configure -SUBST_MESSAGE.gvproxy= fix PREFIX inside patch -SUBST_VARS.gvproxy= PREFIX +SUBST_CLASSES+= prefix +SUBST_FILES.prefix+= pkg/machine/qemu/options_darwin_arm64.go +SUBST_FILES.prefix+= vendor/github.com/containers/common/pkg/config/config_darwin.go +SUBST_FILES.prefix+= vendor/github.com/containers/common/pkg/config/config_netbsd.go +SUBST_STAGE.prefix= pre-configure +SUBST_MESSAGE.prefix= fix PREFIX inside patch +SUBST_VARS.prefix= PREFIX CHECK_PORTABILITY_SKIP+= vendor/github.com/containers/buildah/release.sh Index: pkgsrc/sysutils/podman/distinfo diff -u pkgsrc/sysutils/podman/distinfo:1.5 pkgsrc/sysutils/podman/distinfo:1.6 --- pkgsrc/sysutils/podman/distinfo:1.5 Sat Dec 18 18:11:48 2021 +++ pkgsrc/sysutils/podman/distinfo Sun Nov 6 12:39:14 2022 @@ -1,16 +1,18 @@ -$NetBSD: distinfo,v 1.5 2021/12/18 18:11:48 leot Exp $ +$NetBSD: distinfo,v 1.6 2022/11/06 12:39:14 tnn Exp $ BLAKE2s (podman-3.4.4.tar.gz) = d9923d89d2c36269696e7e8a873cc789988b586121e53d9d8fcd32e156464501 SHA512 (podman-3.4.4.tar.gz) = cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666 Size (podman-3.4.4.tar.gz) = 10945990 bytes SHA1 (patch-Makefile) = 5671f5452430d4b94af924defbb473eb91732281 SHA1 (patch-cmd_podman_registry_config.go) = 6d32a7526cad5728a385de0029b2bbe5474e7f1b +SHA1 (patch-pkg_machine_qemu_options__darwin__arm64.go) = fadd696fae75b58b45edd8bd02f42291675bd242 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-utils_utils__supported.go) = 37c999dbf55ff98017d1a4d017d20d576e28d42d 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__darwin.go) = 72e34c210344d52c08eabd0ce34dc2fd4d7f8bea SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 0da82c8c514630fe6afed3041c51869915c3fda8 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 Added files: Index: pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__darwin__arm64.go diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__darwin__arm64.go:1.1 --- /dev/null Sun Nov 6 12:39:15 2022 +++ pkgsrc/sysutils/podman/patches/patch-pkg_machine_qemu_options__darwin__arm64.go Sun Nov 6 12:39:15 2022 @@ -0,0 +1,14 @@ +$NetBSD: patch-pkg_machine_qemu_options__darwin__arm64.go,v 1.1 2022/11/06 12:39:15 tnn Exp $ + +Add pkgsrc path for firmware + +--- pkg/machine/qemu/options_darwin_arm64.go.orig 2021-12-08 18:41:11.000000000 +0000 ++++ pkg/machine/qemu/options_darwin_arm64.go +@@ -45,6 +45,7 @@ func getOvmfDir(imagePath, vmName string + */ + func getEdk2CodeFd(name string) string { + dirs := []string{ ++ "@PREFIX@/share/qemu", + "/usr/local/share/qemu", + "/opt/homebrew/share/qemu", + } Index: pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go:1.1 --- /dev/null Sun Nov 6 12:39:15 2022 +++ pkgsrc/sysutils/podman/patches/patch-vendor_github.com_containers_common_pkg_config_config__darwin.go Sun Nov 6 12:39:15 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-vendor_github.com_containers_common_pkg_config_config__darwin.go,v 1.1 2022/11/06 12:39:15 tnn Exp $ + +Adjust paths. Needed to find gvproxy. + +--- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig 2021-12-08 18:41:11 ++++ vendor/github.com/containers/common/pkg/config/config_darwin.go +@@ -17,6 +17,8 @@ var defaultHelperBinariesDir = []string{ + } + + var defaultHelperBinariesDir = []string{ ++ // pkgsrc paths ++ "@PREFIX@/bin", + // Homebrew install paths + "/usr/local/opt/podman/libexec", + "/opt/homebrew/bin", --_----------=_1667738355172750--