1 From 37c2a7380c2b1993e62deee4d80e85ad0340ef78 Mon Sep 17 00:00:00 2001
2 From: Scott Murray <scott.murray@konsulko.com>
3 Date: Thu, 23 Nov 2023 10:43:38 -0500
4 Subject: [PATCH 2/2] 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 kuksa_databroker/databroker-proto/Cargo.toml | 1 -
18 kuksa_databroker/databroker-proto/build.rs | 1 -
19 3 files changed, 21 deletions(-)
21 diff --git a/Cargo.lock b/Cargo.lock
22 index bb9ec7f..383e7e6 100644
25 @@ -162,15 +162,6 @@ version = "1.1.0"
26 source = "registry+https://github.com/rust-lang/crates.io-index"
27 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
32 -source = "registry+https://github.com/rust-lang/crates.io-index"
33 -checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77"
41 @@ -604,7 +595,6 @@ version = "0.4.1"
49 @@ -2244,15 +2234,6 @@ dependencies = [
54 -name = "protobuf-src"
55 -version = "1.1.0+21.5"
56 -source = "registry+https://github.com/rust-lang/crates.io-index"
57 -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
65 diff --git a/kuksa_databroker/databroker-proto/Cargo.toml b/kuksa_databroker/databroker-proto/Cargo.toml
66 index 5957b7e..9b92162 100644
67 --- a/kuksa_databroker/databroker-proto/Cargo.toml
68 +++ b/kuksa_databroker/databroker-proto/Cargo.toml
69 @@ -25,4 +25,3 @@ prost-types = { workspace = true }
72 tonic-build = { workspace = true, features = ["transport", "prost"] }
73 -protobuf-src = "1.1.0"
74 diff --git a/kuksa_databroker/databroker-proto/build.rs b/kuksa_databroker/databroker-proto/build.rs
75 index d02a006..d3a70ac 100644
76 --- a/kuksa_databroker/databroker-proto/build.rs
77 +++ b/kuksa_databroker/databroker-proto/build.rs
79 ********************************************************************************/
81 fn main() -> Result<(), Box<dyn std::error::Error>> {
82 - std::env::set_var("PROTOC", protobuf_src::protoc());
83 tonic_build::configure()
84 .compile_well_known_types(false)
85 .protoc_arg("--experimental_allow_proto3_optional")