<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f871c6077c8723e051676f4a29a41a96c422f56f">https://github.com/macports/macports-ports/commit/f871c6077c8723e051676f4a29a41a96c422f56f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f871c6077c8 podman: Fix `podman machine` for M1
</span>f871c6077c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f871c6077c8723e051676f4a29a41a96c422f56f
</span>Author: Vadim-Valdis Yudaev <judaew@macports.org>
AuthorDate: Tue Dec 7 20:25:05 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> podman: Fix `podman machine` for M1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closed: https://trac.macports.org/ticket/64131
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CHANGES:
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch patch-remove-hvf-accel-option-for-qemu.diff for remove the
</span><span style='display:block; white-space:pre;color:#404040;'> hvf option from the list for arm64. Thus, the `podman machine` for M1
</span><span style='display:block; white-space:pre;color:#404040;'> should work correctly.
</span>---
sysutils/podman/Portfile | 9 +++++++++
.../podman/files/patch-remove-hvf-accel-option-for-qemu.diff | 11 +++++++++++
2 files changed, 20 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/Portfile b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bc6f3ecbfd..8dd1be71f71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,12 @@ go.setup github.com/containers/podman 3.4.3 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${version} eq "3.4.3"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
license Apache-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +40,9 @@ post-extract {
</span> patchfiles patch-defaultHelperBinariesDir-for-MacPorts.diff \
patch-getEdk2CodeFd-for-MacPorts.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/64131#comment:3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-remove-hvf-accel-option-for-qemu.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff b/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..efaaa0c5980
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/files/patch-remove-hvf-accel-option-for-qemu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pkg/machine/qemu/options_darwin_arm64.go.orig 2021-12-07 02:28:38.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pkg/machine/qemu/options_darwin_arm64.go 2021-12-07 02:28:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func (v *MachineVM) addArchOptions() []string {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ovmfDir := getOvmfDir(v.ImagePath, v.Name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts := []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "-accel", "hvf",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-accel", "tcg",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-cpu", "cortex-a57",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-M", "virt,highmem=off",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>