recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch

   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
   5
   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.
  11
  12 Upstream-Status: Pending
  13
  14 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
  15 ---
  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(-)
  21
  22 diff --git a/Cargo.lock b/Cargo.lock
  23 index eb212b0..fdce813 100644
  24 --- a/Cargo.lock
  25 +++ b/Cargo.lock
  26 @@ -162,15 +162,6 @@ version = "1.3.0"
  27  source = "registry+https://github.com/rust-lang/crates.io-index"
  28  checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
  29
  30 -[[package]]
  31 -name = "autotools"
  32 -version = "0.2.7"
  33 -source = "registry+https://github.com/rust-lang/crates.io-index"
  34 -checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
  35 -dependencies = [
  36 - "cc",
  37 -]
  38 -
  39  [[package]]
  40  name = "axum"
  41  version = "0.6.20"
  42 @@ -650,7 +641,6 @@ version = "0.4.5"
  43  dependencies = [
  44   "prost",
  45   "prost-types",
  46 - "protobuf-src",
  47   "tonic",
  48   "tonic-build",
  49  ]
  50 @@ -2322,15 +2312,6 @@ dependencies = [
  51   "prost",
  52  ]
  53
  54 -[[package]]
  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"
  59 -dependencies = [
  60 - "autotools",
  61 -]
  62 -
  63  [[package]]
  64  name = "quote"
  65  version = "1.0.36"
  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 }
  71
  72  [build-dependencies]
  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
  79 @@ -12,7 +12,6 @@
  80  ********************************************************************************/
  81
  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
  89 --- a/lib/Cargo.lock
  90 +++ b/lib/Cargo.lock
  91 @@ -71,15 +71,6 @@ version = "1.3.0"
  92  source = "registry+https://github.com/rust-lang/crates.io-index"
  93  checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
  94
  95 -[[package]]
  96 -name = "autotools"
  97 -version = "0.2.7"
  98 -source = "registry+https://github.com/rust-lang/crates.io-index"
  99 -checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf"
 100 -dependencies = [
 101 - "cc",
 102 -]
 103 -
 104  [[package]]
 105  name = "axum"
 106  version = "0.6.20"
 107 @@ -182,7 +173,6 @@ version = "0.4.5"
 108  dependencies = [
 109   "prost",
 110   "prost-types",
 111 - "protobuf-src",
 112   "tonic 0.11.0",
 113   "tonic-build",
 114  ]
 115 @@ -663,15 +653,6 @@ dependencies = [
 116   "prost",
 117  ]
 118
 119 -[[package]]
 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"
 124 -dependencies = [
 125 - "autotools",
 126 -]
 127 -
 128  [[package]]
 129  name = "quote"
 130  version = "1.0.36"
 131 --
 132 2.44.0
 133