Skip to content

Commit 267b971

Browse files
author
Dorinda Bassey
committed
Revert CROSVM_USE_SYSTEM_* build and CI changes
This setup is no longer needed since: - The current build system and GPU backend integration have been restructured. - CI now works with the virglrenderer crate. - Environment variable overrides are no longer necessary to avoid CI failures. Signed-off-by: Dorinda Bassey <[email protected]>
1 parent 3256141 commit 267b971

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

.buildkite/main-tests.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"tests": [
33
{
44
"test_name": "build-gnu",
5-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 RUSTFLAGS=\"-D warnings\" cargo build --release",
5+
"command": "RUSTFLAGS=\"-D warnings\" cargo build --release",
66
"platform": [
77
"x86_64",
88
"aarch64",
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"test_name": "unittests-gnu",
30-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo test --all-features --workspace",
30+
"command": "cargo test --all-features --workspace",
3131
"platform": [
3232
"x86_64",
3333
"aarch64",
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"test_name": "unittests-gnu-release",
53-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo test --release --all-features --workspace",
53+
"command": "cargo test --release --all-features --workspace",
5454
"platform": [
5555
"x86_64",
5656
"aarch64",
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"test_name": "clippy",
76-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 cargo clippy --workspace --bins --examples --benches --all-features --all-targets -- -D warnings -D clippy::undocumented_unsafe_blocks",
76+
"command": "cargo clippy --workspace --bins --examples --benches --all-features --all-targets -- -D warnings -D clippy::undocumented_unsafe_blocks",
7777
"platform": [
7878
"x86_64",
7979
"aarch64",
@@ -82,7 +82,7 @@
8282
},
8383
{
8484
"test_name": "check-warnings",
85-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 RUSTFLAGS=\"-D warnings\" cargo check --all-targets --all-features --workspace",
85+
"command": "RUSTFLAGS=\"-D warnings\" cargo check --all-targets --all-features --workspace",
8686
"platform": [
8787
"x86_64",
8888
"aarch64",
@@ -91,7 +91,7 @@
9191
},
9292
{
9393
"test_name": "coverage",
94-
"command": "CROSVM_USE_SYSTEM_VIRGLRENDERER=1 CROSVM_USE_SYSTEM_MINIGBM=1 pytest $(find . -type f -name \"test_coverage.py\")",
94+
"command": "pytest $(find . -type f -name \"test_coverage.py\")",
9595
"docker_plugin": {
9696
"privileged": true
9797
},

vhost-device-gpu/README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,10 @@ Because blob resources are not yet supported, some capsets are limited:
9090
The device leverages the [rutabaga_gfx](https://crates.io/crates/rutabaga_gfx)
9191
crate to provide rendering with virglrenderer and gfxstream.
9292

93-
This crate supports two GPU backends: gfxstream (default) and virglrenderer.
94-
Both require the system-provided virglrenderer and minigbm libraries due to the dependence on rutabaga_gfx.
95-
96-
Install the development packages for your distro, then build with:
97-
98-
```session
99-
CROSVM_USE_SYSTEM_VIRGLRENDERER=1 \
100-
CROSVM_USE_SYSTEM_MINIGBM=1 \
101-
cargo build
102-
```
103-
10493
gfxstream support is compiled by default, it can be disabled by not building with the `gfxstream` feature flag, for example:
10594

10695
```session
107-
CROSVM_USE_SYSTEM_VIRGLRENDERER=1 \
108-
CROSVM_USE_SYSTEM_MINIGBM=1 \
109-
cargo build --no-default-features
96+
$ cargo build --no-default-features
11097
```
11198

11299
With Virglrenderer, Rutabaga translates OpenGL API and Vulkan calls to an

0 commit comments

Comments
 (0)