1 From 953c80a2acc2bbb882a2dcbbbf0eae7098cbd1fa Mon Sep 17 00:00:00 2001
2 From: Scott Murray <scott.murray@konsulko.com>
3 Date: Tue, 18 Jun 2024 15:53:46 -0400
4 Subject: [PATCH] Remove protobuf-src usage
6 The vendoring of a protoc and libprotobuf build that was added in
7 commit 890703c9 by using protobuf-src is not really workable with
8 OpenEmbedded / Yocto Project, and somewhat undesirable for any
9 distribution package builds when it comes to transparency and
10 reproducibility. Remove it so that building in OE/YP will work.
12 Upstream-Status: Pending
14 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
16 Cargo.lock | 19 -------------------
17 databroker-proto/Cargo.toml | 1 -
18 databroker-proto/build.rs | 1 -
19 lib/Cargo.lock | 19 -------------------
20 4 files changed, 40 deletions(-)
22 diff --git a/Cargo.lock b/Cargo.lock
23 index eb212b0..fdce813 100644
26 @@ -162,15 +162,6 @@ version = "1.3.0"
27 source = "registry+https://github.com/rust-lang/crates.io-index"
28 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
33 -source = "registry+https://github.com/rust-lang/crates.io-index"
34 -checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
42 @@ -650,7 +641,6 @@ version = "0.4.5"
50 @@ -2322,15 +2312,6 @@ dependencies = [
55 -name = "protobuf-src"
56 -version = "1.1.0+21.5"
57 -source = "registry+https://github.com/rust-lang/crates.io-index"
58 -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
66 diff --git a/databroker-proto/Cargo.toml b/databroker-proto/Cargo.toml
67 index 9d548b2..2f4a7f1 100644
68 --- a/databroker-proto/Cargo.toml
69 +++ b/databroker-proto/Cargo.toml
70 @@ -25,4 +25,3 @@ prost-types = { workspace = true }
73 tonic-build = { workspace = true, features = ["transport", "prost"] }
74 -protobuf-src = "1.1.0"
75 diff --git a/databroker-proto/build.rs b/databroker-proto/build.rs
76 index d02a006..d3a70ac 100644
77 --- a/databroker-proto/build.rs
78 +++ b/databroker-proto/build.rs
80 ********************************************************************************/
82 fn main() -> Result<(), Box<dyn std::error::Error>> {
83 - std::env::set_var("PROTOC", protobuf_src::protoc());
84 tonic_build::configure()
85 .compile_well_known_types(false)
86 .protoc_arg("--experimental_allow_proto3_optional")
87 diff --git a/lib/Cargo.lock b/lib/Cargo.lock
88 index 5ba0b78..7dc93f3 100644
91 @@ -71,15 +71,6 @@ version = "1.3.0"
92 source = "registry+https://github.com/rust-lang/crates.io-index"
93 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
98 -source = "registry+https://github.com/rust-lang/crates.io-index"
99 -checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
107 @@ -182,7 +173,6 @@ version = "0.4.5"
115 @@ -663,15 +653,6 @@ dependencies = [
120 -name = "protobuf-src"
121 -version = "1.1.0+21.5"
122 -source = "registry+https://github.com/rust-lang/crates.io-index"
123 -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"