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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
From 9e5b68749fb8e9fe932b90f92a95aa2d18d83795 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 4 Dec 2024 09:53:15 -0500
Subject: [PATCH] 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 -------------------
databroker-proto/Cargo.toml | 1 -
databroker-proto/build.rs | 1 -
lib/Cargo.lock | 19 -------------------
4 files changed, 40 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index df1ef1a..56837b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,15 +180,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-[[package]]
-name = "autotools"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "axum"
version = "0.6.20"
@@ -664,7 +655,6 @@ version = "0.5.0"
dependencies = [
"prost",
"prost-types",
- "protobuf-src",
"tonic",
"tonic-build",
]
@@ -2494,15 +2484,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.37"
diff --git a/databroker-proto/Cargo.toml b/databroker-proto/Cargo.toml
index 2475412..877c270 100644
--- a/databroker-proto/Cargo.toml
+++ b/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/databroker-proto/build.rs b/databroker-proto/build.rs
index 1a832c9..8a85b9d 100644
--- a/databroker-proto/build.rs
+++ b/databroker-proto/build.rs
@@ -14,7 +14,6 @@
use std::{env, path::PathBuf};
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")
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
index 2a147ff..0835e6f 100644
--- a/lib/Cargo.lock
+++ b/lib/Cargo.lock
@@ -71,15 +71,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-[[package]]
-name = "autotools"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "axum"
version = "0.6.20"
@@ -191,7 +182,6 @@ version = "0.5.0"
dependencies = [
"prost",
"prost-types",
- "protobuf-src",
"tonic",
"tonic-build",
]
@@ -682,15 +672,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.37"
--
2.47.0
|
