github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3214 from rn/crosvm

Browse Source 
Update crosvm
This commit is contained in:
Rolf Neugebauer 2018-10-29 23:58:41 +00:00 committed by GitHub
commit eac17cc85f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/crosvm/Dockerfile
View File

@ -1,7 +1,7 @@
FROM rust:1.25.0-stretch FROM rust:1.30.0-stretch
ENV CROSVM_REPO=https://chromium.googlesource.com/chromiumos/platform/crosvm ENV CROSVM_REPO=https://chromium.googlesource.com/chromiumos/platform/crosvm
ENV CROSVM_COMMIT=7a7268faf0a43c79b6a4520f5c2f35c3e0233932 ENV CROSVM_COMMIT=510c783c847b6d0c18516f31fbe3dbdc782f1252
ENV MINIJAIL_REPO=https://android.googlesource.com/platform/external/minijail ENV MINIJAIL_REPO=https://android.googlesource.com/platform/external/minijail
ENV MINIJAIL_COMMIT=d45fc420bb8fd9d1fc9297174f3c344db8c20bbd ENV MINIJAIL_COMMIT=d45fc420bb8fd9d1fc9297174f3c344db8c20bbd

28
contrib/crosvm/README.md
View File

@ -25,34 +25,14 @@ You may also have to create an empty directory `/var/empty`.
## Use with LinuxKit images ## Use with LinuxKit images
You can build a LinuxKit image suitable for `crosvm` with the You can build a LinuxKit image suitable for `crosvm` with the
`kernel+squashfs` build format. For example, using this LinuxKit `kernel+squashfs` build format. For example, using `minimal.yml` from
YAML file (`minimal.yml`): the `./examples` directory, run:
```
kernel:
image: linuxkit/kernel:4.9.135
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:6eb0158059b056a1567236280880cb87f03ff008
- linuxkit/runc:6cf26a0403376de3b5396cb676b88eea4f37aff8
- linuxkit/containerd:d955db7cd28dbd7be8a17d7063cc6b7f1bf91f0a
services:
- name: getty
image: linuxkit/getty:v0.6
env:
- INSECURE=true
trust:
org:
- linuxkit
```
run:
```sh ```sh
linuxkit build -output kernel+squashfs minimal.yml linuxkit build -format kernel+squashfs minimal.yml
``` ```
The kernel this produces (`minimal-kernel`) needs to be converted as The generated kernel file (`minimal-kernel`) needs to be converted as
`crosvm` does not grok `bzImage`s. You can convert the LinuxKit kernel `crosvm` does not grok `bzImage`s. You can convert the LinuxKit kernel
image with image with
[extract-vmlinux](https://raw.githubusercontent.com/torvalds/linux/master/scripts/extract-vmlinux): [extract-vmlinux](https://raw.githubusercontent.com/torvalds/linux/master/scripts/extract-vmlinux):