From 7283201749e5fc69cb90a3dd51b845cc34fe1c4c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 15 Jul 2022 14:27:47 +0900 Subject: [PATCH 1/2] templates: clean up almalinux-9 and centos-stream-9 Signed-off-by: Akihiro Suda --- examples/experimental/almalinux-9.yaml | 7 ++----- examples/experimental/centos-stream-9.yaml | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/examples/experimental/almalinux-9.yaml b/examples/experimental/almalinux-9.yaml index 5ab090608f6..5284d71f7b3 100644 --- a/examples/experimental/almalinux-9.yaml +++ b/examples/experimental/almalinux-9.yaml @@ -1,4 +1,4 @@ -# This example requires Lima v0.8.3 or later. +# This example requires Lima v0.11.1 or later. images: - location: "http://repo.almalinux.org/almalinux/9.0/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.0-20220527.x86_64.qcow2" @@ -11,9 +11,6 @@ mounts: - location: "~" - location: "/tmp/lima" writable: true -firmware: - legacyBIOS: true cpuType: - # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac - # https://bugs.launchpad.net/qemu/+bug/1838390 + # Workaround for "intel_pstate: CPU model not supported" x86_64: "Haswell-v4" diff --git a/examples/experimental/centos-stream-9.yaml b/examples/experimental/centos-stream-9.yaml index a84f6023bd7..48087d92888 100644 --- a/examples/experimental/centos-stream-9.yaml +++ b/examples/experimental/centos-stream-9.yaml @@ -1,4 +1,4 @@ -# This example requires Lima v0.8.3 or later. +# This example requires Lima v0.11.1 or later. images: - location: "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20220606.0.x86_64.qcow2" @@ -12,8 +12,8 @@ mounts: - location: "/tmp/lima" writable: true firmware: + # CentOS Stream 9 still requires legacyBIOS, while AlmaLinux 9 and Rocky Linux 9 do not. legacyBIOS: true cpuType: - # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac - # https://bugs.launchpad.net/qemu/+bug/1838390 + # Workaround for "intel_pstate: CPU model not supported" x86_64: "Haswell-v4" From 26dd16ec720719828bfe8fb4c7dd81e759fe1a93 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 15 Jul 2022 14:28:38 +0900 Subject: [PATCH 2/2] templates: add experimental/rocky-9 Signed-off-by: Akihiro Suda --- examples/README.md | 1 + examples/experimental/rocky-9.yaml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 examples/experimental/rocky-9.yaml diff --git a/examples/README.md b/examples/README.md index bf00dc16f74..b4e2316cf5d 100644 --- a/examples/README.md +++ b/examples/README.md @@ -37,6 +37,7 @@ Others: - [`vmnet.yaml`](./vmnet.yaml): ⭐enable [`vmnet.framework`](../docs/network.md) - [`deprecated/centos-7.yaml`](./deprecated/centos-7.yaml): [deprecated] CentOS Linux 7 - [`experimental/almalinux-9.yaml`](experimental/almalinux-9.yaml): [experimental] AlmaLinux 9 +- [`experimental/rocky-9.yaml`](experimental/rocky-9.yaml): [experimental] Rocky Linux 9 - [`experimental/centos-stream-9.yaml`](experimental/centos-stream-9.yaml): [experimental] CentOS Stream 9 - [`experimental/9p.yaml`](experimental/9p.yaml): [experimental] use 9p mount type - [`experimental/riscv64.yaml`](experimental/riscv64.yaml): [experimental] RISC-V diff --git a/examples/experimental/rocky-9.yaml b/examples/experimental/rocky-9.yaml new file mode 100644 index 00000000000..bcd7bb98fc8 --- /dev/null +++ b/examples/experimental/rocky-9.yaml @@ -0,0 +1,16 @@ +# This example requires Lima v0.11.1 or later. + +images: +- location: "https://dl.rockylinux.org/pub/rocky/9.0/images/x86_64/Rocky-9-GenericCloud-9.0-20220706.0.x86_64.qcow2" + arch: "x86_64" + digest: "sha256:9305faad09707ab72ec8e4a7b2cdc8e20bc31b608443d6c6df954fd2f3371aa2" +- location: "https://dl.rockylinux.org/pub/rocky/9.0/images/aarch64/Rocky-9-GenericCloud-9.0-20220706.0.aarch64.qcow2" + arch: "aarch64" + digest: "sha256:21061e421267e573c39197aaf7f4298424238dab7e7ad44f09a2b805e8d18ea5" +mounts: +- location: "~" +- location: "/tmp/lima" + writable: true +cpuType: + # For consistency with AlmaLinux 9 + x86_64: "Haswell-v4"