From 4c21bc033a84949b557a78e5147b7bd1d4f38aff Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 7 Aug 2023 15:19:34 -0400 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 --- 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 54defdf..2795ace 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,15 +170,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.19" @@ -536,7 +527,6 @@ version = "0.4.0" dependencies = [ "prost", "prost-types", - "protobuf-src", "tonic", "tonic-build", ] @@ -2258,15 +2248,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.32" diff --git a/kuksa_databroker/databroker-proto/Cargo.toml b/kuksa_databroker/databroker-proto/Cargo.toml index af73696..023c709 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> { - std::env::set_var("PROTOC", protobuf_src::protoc()); tonic_build::configure() .compile_well_known_types(false) .protoc_arg("--experimental_allow_proto3_optional") -- 2.41.0