X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-connectivity%2Fkuksa-val%2Fkuksa-databroker%2F0002-Remove-protobuf-src-usage.patch;fp=recipes-connectivity%2Fkuksa-val%2Fkuksa-databroker%2F0001-Remove-protobuf-src-usage.patch;h=05e92c7d1b8b472dee70940db7c62ebaac1e91da;hb=470045b42e4175ed778a24664c910ed57c510c4f;hp=a797b7efb094cad1f553d62e05ce0e83b202fc89;hpb=cbeacb02ef678b4c3d53429548bb12105b22b7f0;p=AGL%2Fmeta-agl-demo.git diff --git a/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch b/recipes-connectivity/kuksa-val/kuksa-databroker/0002-Remove-protobuf-src-usage.patch similarity index 86% rename from recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch rename to recipes-connectivity/kuksa-val/kuksa-databroker/0002-Remove-protobuf-src-usage.patch index a797b7efb..05e92c7d1 100644 --- a/recipes-connectivity/kuksa-val/kuksa-databroker/0001-Remove-protobuf-src-usage.patch +++ b/recipes-connectivity/kuksa-val/kuksa-databroker/0002-Remove-protobuf-src-usage.patch @@ -1,7 +1,7 @@ -From 4c21bc033a84949b557a78e5147b7bd1d4f38aff Mon Sep 17 00:00:00 2001 +From 37c2a7380c2b1993e62deee4d80e85ad0340ef78 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 +Date: Thu, 23 Nov 2023 10:43:38 -0500 +Subject: [PATCH 2/2] 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 @@ -19,10 +19,10 @@ Signed-off-by: Scott Murray 3 files changed, 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 54defdf..2795ace 100644 +index bb9ec7f..383e7e6 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -170,15 +170,6 @@ version = "1.1.0" +@@ -162,15 +162,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" @@ -37,8 +37,8 @@ index 54defdf..2795ace 100644 - [[package]] name = "axum" - version = "0.6.19" -@@ -536,7 +527,6 @@ version = "0.4.0" + version = "0.6.20" +@@ -604,7 +595,6 @@ version = "0.4.1" dependencies = [ "prost", "prost-types", @@ -46,7 +46,7 @@ index 54defdf..2795ace 100644 "tonic", "tonic-build", ] -@@ -2258,15 +2248,6 @@ dependencies = [ +@@ -2244,15 +2234,6 @@ dependencies = [ "prost", ] @@ -61,9 +61,9 @@ index 54defdf..2795ace 100644 - [[package]] name = "quote" - version = "1.0.32" + version = "1.0.33" diff --git a/kuksa_databroker/databroker-proto/Cargo.toml b/kuksa_databroker/databroker-proto/Cargo.toml -index af73696..023c709 100644 +index 5957b7e..9b92162 100644 --- a/kuksa_databroker/databroker-proto/Cargo.toml +++ b/kuksa_databroker/databroker-proto/Cargo.toml @@ -25,4 +25,3 @@ prost-types = { workspace = true } @@ -84,5 +84,5 @@ index d02a006..d3a70ac 100644 .compile_well_known_types(false) .protoc_arg("--experimental_allow_proto3_optional") -- -2.41.0 +2.42.0