diff options
Diffstat (limited to 'recipes-connectivity/kuksa-val/kuksa-databroker')
| -rw-r--r-- | recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch | 91 |
1 files changed, 68 insertions, 23 deletions
diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch b/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch index 05e92c7d1..c6c2381d6 100644 --- a/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch +++ b/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch @@ -1,7 +1,7 @@ -From 37c2a7380c2b1993e62deee4d80e85ad0340ef78 Mon Sep 17 00:00:00 2001 +From 953c80a2acc2bbb882a2dcbbbf0eae7098cbd1fa 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 +Date: Tue, 18 Jun 2024 15:53:46 -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 @@ -13,24 +13,25 @@ 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(-) + 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 bb9ec7f..383e7e6 100644 +index eb212b0..fdce813 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -162,15 +162,6 @@ version = "1.1.0" +@@ -162,15 +162,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "autotools" --version = "0.2.6" +-version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77" +-checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf" -dependencies = [ - "cc", -] @@ -38,7 +39,7 @@ index bb9ec7f..383e7e6 100644 [[package]] name = "axum" version = "0.6.20" -@@ -604,7 +595,6 @@ version = "0.4.1" +@@ -650,7 +641,6 @@ version = "0.4.5" dependencies = [ "prost", "prost-types", @@ -46,7 +47,7 @@ index bb9ec7f..383e7e6 100644 "tonic", "tonic-build", ] -@@ -2244,15 +2234,6 @@ dependencies = [ +@@ -2322,15 +2312,6 @@ dependencies = [ "prost", ] @@ -61,20 +62,20 @@ index bb9ec7f..383e7e6 100644 - [[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 + version = "1.0.36" +diff --git a/databroker-proto/Cargo.toml b/databroker-proto/Cargo.toml +index 9d548b2..2f4a7f1 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/kuksa_databroker/databroker-proto/build.rs b/kuksa_databroker/databroker-proto/build.rs +diff --git a/databroker-proto/build.rs b/databroker-proto/build.rs index d02a006..d3a70ac 100644 ---- a/kuksa_databroker/databroker-proto/build.rs -+++ b/kuksa_databroker/databroker-proto/build.rs +--- a/databroker-proto/build.rs ++++ b/databroker-proto/build.rs @@ -12,7 +12,6 @@ ********************************************************************************/ @@ -83,6 +84,50 @@ index d02a006..d3a70ac 100644 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 5ba0b78..7dc93f3 100644 +--- a/lib/Cargo.lock ++++ b/lib/Cargo.lock +@@ -71,15 +71,6 @@ version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +-[[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" +@@ -182,7 +173,6 @@ version = "0.4.5" + dependencies = [ + "prost", + "prost-types", +- "protobuf-src", + "tonic 0.11.0", + "tonic-build", + ] +@@ -663,15 +653,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.36" -- -2.42.0 +2.44.0 |