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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 37c2a7380c2b1993e62deee4d80e85ad0340ef78 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 23 Nov 2023 10:43:38 -0500
Subject: [PATCH 2/2] Remove protobuf-src usage
The vendoring of a protoc and libprotobuf build that was added in
commit 890703c9 by using protobuf-src is not really workable with
OpenEmbedded / Yocto Project, and somewhat undesirable for any
distribution package builds when it comes to transparency and
reproducibility. Remove it so that building in OE/YP will work.
Upstream-Status: Pending
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
Cargo.lock | 19 -------------------
kuksa_databroker/databroker-proto/Cargo.toml | 1 -
kuksa_databroker/databroker-proto/build.rs | 1 -
3 files changed, 21 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index bb9ec7f..383e7e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -162,15 +162,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-[[package]]
-name = "autotools"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "axum"
version = "0.6.20"
@@ -604,7 +595,6 @@ version = "0.4.1"
dependencies = [
"prost",
"prost-types",
- "protobuf-src",
"tonic",
"tonic-build",
]
@@ -2244,15 +2234,6 @@ dependencies = [
"prost",
]
-[[package]]
-name = "protobuf-src"
-version = "1.1.0+21.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
-dependencies = [
- "autotools",
-]
-
[[package]]
name = "quote"
version = "1.0.33"
diff --git a/kuksa_databroker/databroker-proto/Cargo.toml b/kuksa_databroker/databroker-proto/Cargo.toml
index 5957b7e..9b92162 100644
--- a/kuksa_databroker/databroker-proto/Cargo.toml
+++ b/kuksa_databroker/databroker-proto/Cargo.toml
@@ -25,4 +25,3 @@ prost-types = { workspace = true }
[build-dependencies]
tonic-build = { workspace = true, features = ["transport", "prost"] }
-protobuf-src = "1.1.0"
diff --git a/kuksa_databroker/databroker-proto/build.rs b/kuksa_databroker/databroker-proto/build.rs
index d02a006..d3a70ac 100644
--- a/kuksa_databroker/databroker-proto/build.rs
+++ b/kuksa_databroker/databroker-proto/build.rs
@@ -12,7 +12,6 @@
********************************************************************************/
fn main() -> Result<(), Box<dyn std::error::Error>> {
- std::env::set_var("PROTOC", protobuf_src::protoc());
tonic_build::configure()
.compile_well_known_types(false)
.protoc_arg("--experimental_allow_proto3_optional")
--
2.42.0
|
