pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lima: Update to 0.11.1



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jun 19 15:07:52 2022 +0200
Changeset:	242ef54c108ebc5c1ab309889eee77a618aec45c

Modified Files:
	lima/Makefile
	lima/PLIST
	lima/distinfo
	lima/go-modules.mk
	lima/patches/patch-pkg_limayaml_defaults.go
Removed Files:
	lima/patches/patch-pkg_sshutil_sshutil__others.go

Log Message:
lima: Update to 0.11.1

Changes
nerdctl:
 - Update nerdctl to v0.21.0. This releases fixes the regression of nerdctl compose up.

YAML:
 - Add .[]mounts.mountPoint to support specifying a custom mount point
 - Add .ssh.forwardX11 and .ssh.forwardX11Trusted to allow X11 forwarding

limactl CLI:
 - Expand the instance message fields during inspection (#903, thanks to @jandubois)

Templates:
 - alpine: Update to alpine-lima v0.2.17 (Alpine Linux 3.16)
 - archlinux: Update to ArchLinux 20220615.61815
 - centos-stream: Add centos-stream (CentOS Stream 8-20220125.1)
 - opensuse: Update to openSUSE Leap 15.4
 - oraclelinux: Update to Oracle Linux 8.6; support ARM
 - podman: Change the VM distro from Ubuntu 22.04 (Podman 3) to Fedora 36 (Podman 4)
 - experimental/almalinux-9: Add experimental/almalinux-9 (AlmaLinux 9.0)
 - experimental/apptainer: Add experimental/apptainer (Apptainer 1.0.2 on Rocky Linux 8.5)
 - experimental/centos-stream-9: Add experimental/centos-stream-9 (CentOS Stream 9-20220606.0)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=242ef54c108ebc5c1ab309889eee77a618aec45c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lima/Makefile                                     |  2 +-
 lima/PLIST                                        |  4 ++
 lima/distinfo                                     | 45 +++++++++++------------
 lima/go-modules.mk                                | 12 +++---
 lima/patches/patch-pkg_limayaml_defaults.go       | 25 ++++++++-----
 lima/patches/patch-pkg_sshutil_sshutil__others.go | 14 -------
 6 files changed, 48 insertions(+), 54 deletions(-)

diffs:
diff --git a/lima/Makefile b/lima/Makefile
index 06188f7783..03856f73e9 100644
--- a/lima/Makefile
+++ b/lima/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	lima-0.11.0
+DISTNAME=	lima-0.11.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lima-vm/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/lima/PLIST b/lima/PLIST
index 04e11e8736..dc273f18af 100644
--- a/lima/PLIST
+++ b/lima/PLIST
@@ -23,11 +23,15 @@ share/lima/examples/almalinux.yaml
 share/lima/examples/alpine.yaml
 share/lima/examples/archlinux.yaml
 share/lima/examples/buildkit.yaml
+share/lima/examples/centos-stream.yaml
 share/lima/examples/debian.yaml
 share/lima/examples/default.yaml
 share/lima/examples/deprecated/centos-7.yaml
 share/lima/examples/docker.yaml
 share/lima/examples/experimental/9p.yaml
+share/lima/examples/experimental/almalinux-9.yaml
+share/lima/examples/experimental/apptainer.yaml
+share/lima/examples/experimental/centos-stream-9.yaml
 share/lima/examples/experimental/riscv64.yaml
 share/lima/examples/faasd.yaml
 share/lima/examples/fedora.yaml
diff --git a/lima/distinfo b/lima/distinfo
index 908b25d80a..c8e53269fb 100644
--- a/lima/distinfo
+++ b/lima/distinfo
@@ -9,12 +9,12 @@ Size (cloud.google.com_go_@v_v0.26.0.mod) = 27 bytes
 BLAKE2s (cloud.google.com_go_@v_v0.34.0.mod) = 53d181aacbf96ec4f9cdd051466576dbb6959ca71a825bc6672046c7c53a2b43
 SHA512 (cloud.google.com_go_@v_v0.34.0.mod) = 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 Size (cloud.google.com_go_@v_v0.34.0.mod) = 27 bytes
-BLAKE2s (github.com__alec_aivazis_survey_v2_@v_v2.3.4.mod) = 96bde62d5cb0328ac5d83b64f4f16eb8c1509ccbdb01e52e874c06e81728be02
-SHA512 (github.com__alec_aivazis_survey_v2_@v_v2.3.4.mod) = b69dc9ec295640230cb1578d54b60080572081d1628d5ca44c87f15e5e3c76ae375076491018935c31f7cec5c0d1861b23d64f2472c81ac0cd6e981488abc74a
-Size (github.com__alec_aivazis_survey_v2_@v_v2.3.4.mod) = 595 bytes
-BLAKE2s (github.com__alec_aivazis_survey_v2_@v_v2.3.4.zip) = 236c1364704fee1aaa1dd5239231f359494cf965cd0fdaf9a4f7967efcfa5e26
-SHA512 (github.com__alec_aivazis_survey_v2_@v_v2.3.4.zip) = 20deeef9f195e1d1afd615d3398365dd1f5c9469a64d398464a9e1523165800b200c4e506053208acff6dfc4040d9a56afd3e874cc9eff36af7cac024760dd14
-Size (github.com__alec_aivazis_survey_v2_@v_v2.3.4.zip) = 158293 bytes
+BLAKE2s (github.com__alec_aivazis_survey_v2_@v_v2.3.5.mod) = 783f5ce21e08551742b011a0e6450864f5ceea884b17873b614a0e23e0315043
+SHA512 (github.com__alec_aivazis_survey_v2_@v_v2.3.5.mod) = c19a2efecdb2eef505f82105f5920ba11b707c13dc645516bd1bdb787af3b6dfb83ece5b1786e42f18d5ef9aae8fb9d89b6ba1b371893725779aa5ad9ae4260b
+Size (github.com__alec_aivazis_survey_v2_@v_v2.3.5.mod) = 660 bytes
+BLAKE2s (github.com__alec_aivazis_survey_v2_@v_v2.3.5.zip) = 9f5470590ad9f2e974d2d93762ec2d9ad7ade60bfeaf7e242ab2e4de3a0cf5f8
+SHA512 (github.com__alec_aivazis_survey_v2_@v_v2.3.5.zip) = 7bad3e94c59692b58fe860bf17e47eca13d7718b342130927f82677d3a5718a426f733b11d0b1a11d8f5328384699660e4b79fb116506deaa341b2540d1a1fc0
+Size (github.com__alec_aivazis_survey_v2_@v_v2.3.5.zip) = 159364 bytes
 BLAKE2s (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 1e3e33c00707a3593021eb034c331e03c391be2a8977de8635ddcdd39b13ded4
 SHA512 (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 Size (github.com__burnt_sushi_toml_@v_v0.3.1.mod) = 34 bytes
@@ -84,12 +84,12 @@ Size (github.com_cncf_xds_go_@v_v0.0.0-20210922020428-25de7278fc84.mod) = 169 by
 BLAKE2s (github.com_cncf_xds_go_@v_v0.0.0-20211011173535-cb28da3451f1.mod) = e1da5fba34df0366d5770a9c651e78cf2862be1deeae4d8a3df8770c1c55227c
 SHA512 (github.com_cncf_xds_go_@v_v0.0.0-20211011173535-cb28da3451f1.mod) = cd8c47886f01235398b4c2538ccb516754e2bae6e9a88e0fa2bd80232f974c5f8cd79249f459c9788fcb7b0c83ced5064f1d8916869e71a15377df20077f52a6
 Size (github.com_cncf_xds_go_@v_v0.0.0-20211011173535-cb28da3451f1.mod) = 169 bytes
-BLAKE2s (github.com_containerd_containerd_@v_v1.6.4.mod) = eee08594d9782b3e0034de47902ab01aac75dbb92c3f34bf2c5e3b1e6402136c
-SHA512 (github.com_containerd_containerd_@v_v1.6.4.mod) = d33de44f7def4f47feafa87be224ad5db315054831446a5a5e4744d5480213834e6463f54403f8fb0c7caa8ee5f260ce26bbcc75e8f8551bdfd1d0c7038cc06d
-Size (github.com_containerd_containerd_@v_v1.6.4.mod) = 6354 bytes
-BLAKE2s (github.com_containerd_containerd_@v_v1.6.4.zip) = c95a0c853038bae10e9aaba57ca4f434dfa1b84c560251ed8b53727e17efcff6
-SHA512 (github.com_containerd_containerd_@v_v1.6.4.zip) = 244da07826b6f30225baf5a660188052ab33d6a86f132ba5f6149fd5e54be0b87a0786c5658d8bd57220d8d099ee842bd9d0f327d2da89b7899a1db60e64ea9c
-Size (github.com_containerd_containerd_@v_v1.6.4.zip) = 2755818 bytes
+BLAKE2s (github.com_containerd_containerd_@v_v1.6.6.mod) = a33573125d9149beeb2f6b739d36e31e25c5423a69214f2db20f2331d4b304b0
+SHA512 (github.com_containerd_containerd_@v_v1.6.6.mod) = 712df3856d6b38e3064927b33a9917370c087e106f1009267acd92bf66644d241f38febd6d43ac002fc8687aa6b8814cf042e89a81616b65d4889cb1ccb69415
+Size (github.com_containerd_containerd_@v_v1.6.6.mod) = 6354 bytes
+BLAKE2s (github.com_containerd_containerd_@v_v1.6.6.zip) = bb2dd263e562a32ae3015872534d65eedb7a850382fd929dc3210ca9812349a0
+SHA512 (github.com_containerd_containerd_@v_v1.6.6.zip) = a293a201cffcd8a350b01397ebc973e701967f1d1b0ce2b3a83e26c8ed386614eda8e3d9d494cf98d83506ec60daee630bbd00941541b903392757dbf2d1b985
+Size (github.com_containerd_containerd_@v_v1.6.6.zip) = 2759930 bytes
 BLAKE2s (github.com_containerd_continuity_@v_v0.3.0.mod) = 08acb3597ef6a1edfeae5d01bd8460a8f0dcf15914bd81e8f409f278132e3832
 SHA512 (github.com_containerd_continuity_@v_v0.3.0.mod) = 3b0167809ae31a83382528241d4006b2f4a8d20fbb300de80d6a3cc66641d8a4f28d12ae043e33730a0685b89c5d7fe20e6c01f464803e3061d17e5ac70b8e1f
 Size (github.com_containerd_continuity_@v_v0.3.0.mod) = 378 bytes
@@ -774,12 +774,12 @@ Size (golang.org_x_sys_@v_v0.0.0-20210630005230-0f9fa26af87c.mod) = 33 bytes
 BLAKE2s (golang.org_x_sys_@v_v0.0.0-20210927094055-39ccf1dd6fa6.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
 SHA512 (golang.org_x_sys_@v_v0.0.0-20210927094055-39ccf1dd6fa6.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 Size (golang.org_x_sys_@v_v0.0.0-20210927094055-39ccf1dd6fa6.mod) = 33 bytes
-BLAKE2s (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
-SHA512 (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-Size (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.mod) = 33 bytes
-BLAKE2s (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.zip) = 87b2d9b8ce8e79b5458631533b989aac2e8c6b48ba029e4028752265081af44c
-SHA512 (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.zip) = 59df6c2d2f721195f72c62e59fe3f47b25a7528a16d4cddfe1f6a01083141a03a3259d73e40588fb5cd95506ee997a4893eb946fff99eda1c9e89adf2a46bf82
-Size (golang.org_x_sys_@v_v0.0.0-20220405210540-1e041c57c461.zip) = 1738331 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
+SHA512 (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+Size (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.mod) = 33 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.zip) = 8f5fa125b9cd8e7e17a2042728d7acbbaa33c98746f6c114698efa6ccff2da2a
+SHA512 (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.zip) = 5889fe01b1b9fda63b3f9d2500f43b3846e05cc66042d46efb4ef499e7b5c2ab21e7347e5255d715f75a377cb43efe3744eda77d45e070ebc5a82ceb2922b60f
+Size (golang.org_x_sys_@v_v0.0.0-20220422013727-9388b58f7150.zip) = 1761469 bytes
 BLAKE2s (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = ea6d2006c1c11da8c2174212a63865a04dec1775f98210c17f3a0cb8d4a1a80f
 SHA512 (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 Size (golang.org_x_term_@v_v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95 bytes
@@ -1017,14 +1017,13 @@ Size (honnef.co_go_tools_@v_v0.0.0-20190523083050-ea95bdfd59fc.mod) = 26 bytes
 BLAKE2s (honnef.co_go_tools_@v_v0.0.1-2019.2.3.mod) = 98c794635efae7dc02265411a4b6bef3ae185a190154b669e17b0cf882321831
 SHA512 (honnef.co_go_tools_@v_v0.0.1-2019.2.3.mod) = 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 Size (honnef.co_go_tools_@v_v0.0.1-2019.2.3.mod) = 300 bytes
-BLAKE2s (lima-0.11.0.tar.gz) = 7838a0ad650ef52bb34e8dc1d0f0a5805763080151b9c6ea5a2c034067ed3664
-SHA512 (lima-0.11.0.tar.gz) = 9dba6860528da7264675cbaa4bd455faebcea063054b9d82dac2922ffef4496c9ccc7342b80af64fb5a2f318e77aa925bb8df6b437e91aba6f564fda1fcf7938
-Size (lima-0.11.0.tar.gz) = 288229 bytes
+BLAKE2s (lima-0.11.1.tar.gz) = de8fde6d2c45d5cf471800d800102214528f0a00e015fd3bc30a079ccc102143
+SHA512 (lima-0.11.1.tar.gz) = 50ac80ba5f93a1cdfa702f3d03989113a4951e48b11a9c0e5e722d77a7df7d5815cf1727b23e866716507dcc9257ea6faeea5e6acf1f328c5a49ed199606330c
+Size (lima-0.11.1.tar.gz) = 290283 bytes
 BLAKE2s (mvdan.cc_interfacer_@v_v0.0.0-20180901003855-c20040233aed.mod) = 2e0da268b8f08004ab8d47b0f69019b4751b5072dabde267279bf98dcf5afa76
 SHA512 (mvdan.cc_interfacer_@v_v0.0.0-20180901003855-c20040233aed.mod) = d58e0c14bafe02b1366d43f00d07951b4c11c3e4d8771d0f658367c107d7ed05266443e50a50e10d01ff57c9eb5bfd3bd95e56b2f56fc5cd704e48d9140d93e3
 Size (mvdan.cc_interfacer_@v_v0.0.0-20180901003855-c20040233aed.mod) = 27 bytes
 BLAKE2s (mvdan.cc_lint_@v_v0.0.0-20170908181259-adc824a0674b.mod) = 9b299fdf708a9ffc005195cf1f318d1c7604c641f683e20411c9acd146a744cf
 SHA512 (mvdan.cc_lint_@v_v0.0.0-20170908181259-adc824a0674b.mod) = a9fafa4c84459dc2958a4587b99823476dccd1e245fde663c42c3fa8784c99df27a3d90e0f9f1125f0a3b82ca89dc28ae58cc0d90084ff9df16acde7981b15ea
 Size (mvdan.cc_lint_@v_v0.0.0-20170908181259-adc824a0674b.mod) = 21 bytes
-SHA1 (patch-pkg_limayaml_defaults.go) = ce6820b8f3f704c009b9b0b7bde12f9c29a368d5
-SHA1 (patch-pkg_sshutil_sshutil__others.go) = c6b9ec8631e1a5a400006b20eb4c6f503af898be
+SHA1 (patch-pkg_limayaml_defaults.go) = 052c69b62dee25935f425ccca095953ad2d9cc50
diff --git a/lima/go-modules.mk b/lima/go-modules.mk
index b50e680e91..e63d6effcc 100644
--- a/lima/go-modules.mk
+++ b/lima/go-modules.mk
@@ -3,8 +3,8 @@
 GO_MODULE_FILES+=	4d63.com/gochecknoinits/@v/v0.0.0-20200108094044-eb73b47b9fc4.mod
 GO_MODULE_FILES+=	cloud.google.com/go/@v/v0.26.0.mod
 GO_MODULE_FILES+=	cloud.google.com/go/@v/v0.34.0.mod
-GO_MODULE_FILES+=	github.com/!alec!aivazis/survey/v2/@v/v2.3.4.mod
-GO_MODULE_FILES+=	github.com/!alec!aivazis/survey/v2/@v/v2.3.4.zip
+GO_MODULE_FILES+=	github.com/!alec!aivazis/survey/v2/@v/v2.3.5.mod
+GO_MODULE_FILES+=	github.com/!alec!aivazis/survey/v2/@v/v2.3.5.zip
 GO_MODULE_FILES+=	github.com/!burnt!sushi/toml/@v/v0.3.1.mod
 GO_MODULE_FILES+=	github.com/!microsoft/go-winio/@v/v0.5.2.mod
 GO_MODULE_FILES+=	github.com/!microsoft/go-winio/@v/v0.5.2.zip
@@ -28,8 +28,8 @@ GO_MODULE_FILES+=	github.com/cncf/xds/go/@v/v0.0.0-20210312221358-fbca930ec8ed.m
 GO_MODULE_FILES+=	github.com/cncf/xds/go/@v/v0.0.0-20210805033703-aa0b78936158.mod
 GO_MODULE_FILES+=	github.com/cncf/xds/go/@v/v0.0.0-20210922020428-25de7278fc84.mod
 GO_MODULE_FILES+=	github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.mod
-GO_MODULE_FILES+=	github.com/containerd/containerd/@v/v1.6.4.mod
-GO_MODULE_FILES+=	github.com/containerd/containerd/@v/v1.6.4.zip
+GO_MODULE_FILES+=	github.com/containerd/containerd/@v/v1.6.6.mod
+GO_MODULE_FILES+=	github.com/containerd/containerd/@v/v1.6.6.zip
 GO_MODULE_FILES+=	github.com/containerd/continuity/@v/v0.3.0.mod
 GO_MODULE_FILES+=	github.com/containerd/continuity/@v/v0.3.0.zip
 GO_MODULE_FILES+=	github.com/coreos/go-semver/@v/v0.3.0.mod
@@ -258,8 +258,8 @@ GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210423185535-09eb48e85fd7.mod
 GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod
 GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod
 GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.mod
-GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20220405210540-1e041c57c461.mod
-GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20220405210540-1e041c57c461.zip
+GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20220422013727-9388b58f7150.mod
+GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20220422013727-9388b58f7150.zip
 GO_MODULE_FILES+=	golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod
 GO_MODULE_FILES+=	golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.mod
 GO_MODULE_FILES+=	golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod
diff --git a/lima/patches/patch-pkg_limayaml_defaults.go b/lima/patches/patch-pkg_limayaml_defaults.go
index c5b890ef5d..8f64dc8670 100644
--- a/lima/patches/patch-pkg_limayaml_defaults.go
+++ b/lima/patches/patch-pkg_limayaml_defaults.go
@@ -1,16 +1,21 @@
 $NetBSD$
 
-Use `-cpu max' instead of `-cpu host' (`-cpu host' seems not supported
-at least on NetBSD).
+Fallback to `-cpu max' on platforms where `-cpu host' is not available.
 
---- pkg/limayaml/defaults.go.orig	2022-05-19 06:28:56.000000000 +0000
+`-cpu max' enables all features supported by the accelerator in the
+current host.
+
+This avoid falling back to a default qemu64 CPU that then ends up in not
+honoring accelerator in qemu.Cmdline().
+
+--- pkg/limayaml/defaults.go.orig	2022-06-19 02:01:22.000000000 +0000
 +++ pkg/limayaml/defaults.go
-@@ -106,7 +106,7 @@ func FillDefault(y, d, o *LimaYAML, file
- 	}
- 	for arch := range cpuType {
- 		if IsNativeArch(arch) {
--			cpuType[arch] = "host"
-+			cpuType[arch] = "max"
+@@ -108,6 +108,8 @@ func FillDefault(y, d, o *LimaYAML, file
+ 		if IsNativeArch(arch) && IsAccelOS() {
+ 			if HasHostCPU() {
+ 				cpuType[arch] = "host"
++			} else {
++				cpuType[arch] = "max"
+ 			}
  		}
  	}
- 	for k, v := range d.CPUType {
diff --git a/lima/patches/patch-pkg_sshutil_sshutil__others.go b/lima/patches/patch-pkg_sshutil_sshutil__others.go
deleted file mode 100644
index 66c34b8416..0000000000
--- a/lima/patches/patch-pkg_sshutil_sshutil__others.go
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-err is never defined.
-
---- pkg/sshutil/sshutil_others.go.orig	2022-05-19 06:28:56.000000000 +0000
-+++ pkg/sshutil/sshutil_others.go
-@@ -11,6 +11,6 @@ import (
- 
- func detectAESAcceleration() bool {
- 	const fallback = runtime.GOARCH == "amd64"
--	logrus.WithError(err).Warnf("cannot detect whether AES accelerator is available, assuming %v", fallback)
-+	logrus.Warnf("cannot detect whether AES accelerator is available, assuming %v", fallback)
- 	return fallback
- }


Home | Main Index | Thread Index | Old Index