github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 08:47:56 +00:00
Code Issues Projects Releases Wiki Activity

build: default to using qemu-lite-x86_64

Browse Source 
Update the runtime to use qemu-lite by default. After a
build this will be observed as the default in configuration.toml

Fixes: #293
Depends-on: github.com/kata-containers/tests#308

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
This commit is contained in:
Eric Ernst 2018-05-16 10:59:20 -07:00
parent 32c734e10b
commit 1382662c1b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/amd64-options.mk
View File

@ -9,4 +9,4 @@ MACHINETYPE := pc
KERNELPARAMS := KERNELPARAMS :=
MACHINEACCELERATORS := MACHINEACCELERATORS :=
QEMUCMD := qemu-system-x86_64 QEMUCMD := qemu-lite-system-x86_64

10
versions.yaml
View File

@ -25,6 +25,7 @@ format: |
commit: "<commit>" commit: "<commit>"
version: "<version>" version: "<version>"
release: "<version>" release: "<version>"
branch: "<git-branch>"
meta: meta:
<key-1>: "<value-1>" <key-1>: "<value-1>"
<key-n>: "<value-n>" <key-n>: "<value-n>"
@ -45,7 +46,8 @@ format: |
- A section MAY define a "meta" section to store additional - A section MAY define a "meta" section to store additional
information about a project or group. information about a project or group.
- Each entry MUST specify ATLEAST one of "commit", "version" and "release". - Each entry MUST specify ATLEAST one of "commit", "version", "release"
and "branch".
- WARNING: Gotcha alert! Remember to double-quote all strings - WARNING: Gotcha alert! Remember to double-quote all strings
(except multi-line strings)! This avoids the possibility of a (except multi-line strings)! This avoids the possibility of a
@ -58,6 +60,12 @@ assets:
hypervisor: hypervisor:
description: "Component used to create virtual machines" description: "Component used to create virtual machines"
qemu-lite:
description: "lightweight VMM that uses KVM"
url: "https://github.com/kata-containers/qemu"
branch: "qemu-lite-2.11.0"
commit: "6ba2bfbee9a80bfd03605c5eb2ca743c8b68389e"
qemu: qemu:
description: "VMM that uses KVM" description: "VMM that uses KVM"
url: "https://github.com/qemu/qemu" url: "https://github.com/qemu/qemu"