patches and low-level development discussion
 help / color / mirror / code / Atom feed
e5d569241547fb3033e2f2fc06e89464f5059d67 blob 1253 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
 
From f8d05ec6b4b581069da14fe54df93b932223cd24 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <alyssa.ross@unikie.com>
Date: Wed, 28 Sep 2022 12:30:42 +0000
Subject: [PATCH 2/3] build: use local virtio-bindings

Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
---
 Cargo.lock | 2 --
 Cargo.toml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b869b6ee..d119f28e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1319,8 +1319,6 @@ dependencies = [
 [[package]]
 name = "virtio-bindings"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b"
 
 [[package]]
 name = "virtio-devices"
diff --git a/Cargo.toml b/Cargo.toml
index 2294b4c3..8900236a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branc
 kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
 versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
 vhost = { path = "../vhost" }
+virtio-bindings = { path = "../virtio-bindings" }
 
 [dev-dependencies]
 dirs = "4.0.0"
-- 
2.37.1

debug log:

solving e5d56924154 ...
found e5d56924154 in https://spectrum-os.org/lists/archives/spectrum-devel/20220928170128.1583791-8-alyssa.ross@unikie.com/ ||
	https://spectrum-os.org/lists/archives/spectrum-devel/20220930210906.1696349-8-alyssa.ross@unikie.com/

applying [1/2] https://spectrum-os.org/lists/archives/spectrum-devel/20220928170128.1583791-8-alyssa.ross@unikie.com/
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/0002-build-use-local-virtio-bindings.patch b/pkgs/applications/virtualization/cloud-hypervisor/0002-build-use-local-virtio-bindings.patch
new file mode 100644
index 00000000000..e5d56924154

1:28: trailing whitespace.
 
1:40: trailing whitespace.
 
1:43: trailing whitespace.
-- 
Checking patch pkgs/applications/virtualization/cloud-hypervisor/0002-build-use-local-virtio-bindings.patch...
1:45: new blank line at EOF.
+
Applied patch pkgs/applications/virtualization/cloud-hypervisor/0002-build-use-local-virtio-bindings.patch cleanly.
warning: 4 lines add whitespace errors.

skipping https://spectrum-os.org/lists/archives/spectrum-devel/20220930210906.1696349-8-alyssa.ross@unikie.com/ for e5d56924154
index at:
100644 e5d569241547fb3033e2f2fc06e89464f5059d67	pkgs/applications/virtualization/cloud-hypervisor/0002-build-use-local-virtio-bindings.patch

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).