Update databroker versions to 0.4.0

Also do "cargo update" and add misssing license file
eclipse · Jul 28, 2023 · a1c9d50 · a1c9d50
1 parent 1f426ca
commit a1c9d50
Show file tree

Hide file tree

Showing 8 changed files with 498 additions and 365 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kuksa_databroker/createbom/README.md b/kuksa_databroker/createbom/README.md
@@ -0,0 +1,20 @@
+# BOM Generator
+
+Generates a BOM
+
+## Troubleshooting
+
+If you run it and you get errors like:
+
+```
+Could not find license file for 0BSD in adler
+Error: BOM creation failed, unresolved licenses detected
+```
+
+The a possible reason is that the `Cargo.lock` in the repository has been updated and some components use licenses
+not covered here. This can be solved by:
+
+* Find the corresponding license test. Check for instance [SPDX](https://spdx.org/licenses/)
+* Verify that license is feasible for our use.
+* Download or create a text file with the license text, do `gzip` and put it in `licensestore` folder.
+* Add the identifier (in the example above `0BSD`) to `maplicensefile.py`
diff --git a/kuksa_databroker/createbom/bomutil/maplicensefile.py b/kuksa_databroker/createbom/bomutil/maplicensefile.py
@@ -33,4 +33,6 @@
     "ISC": "ISC.txt.gz",
     "ring": "ring.LICENSE.txt.gz",
     "rustls-webpki": "webpki.LICENSE.txt.gz",
+    # License text taken from https://spdx.org/licenses/0BSD.html
+    "0BSD": "0BSD.txt.gz",
 }
diff --git a/kuksa_databroker/createbom/licensestore/0BSD.txt.gz b/kuksa_databroker/createbom/licensestore/0BSD.txt.gz
diff --git a/kuksa_databroker/databroker-cli/Cargo.toml b/kuksa_databroker/databroker-cli/Cargo.toml
@@ -13,7 +13,7 @@
 
 [package]
 name = "databroker-cli"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Robert Bosch GmbH"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/kuksa_databroker/databroker-examples/Cargo.toml b/kuksa_databroker/databroker-examples/Cargo.toml
@@ -13,7 +13,7 @@
 
 [package]
 name = "databroker-examples"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Robert Bosch GmbH"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/kuksa_databroker/databroker-proto/Cargo.toml b/kuksa_databroker/databroker-proto/Cargo.toml
@@ -13,7 +13,7 @@
 
 [package]
 name = "databroker-proto"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Robert Bosch GmbH"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/kuksa_databroker/databroker/Cargo.toml b/kuksa_databroker/databroker/Cargo.toml
@@ -13,7 +13,7 @@
 
 [package]
 name = "databroker"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Robert Bosch GmbH"]
 edition = "2018"
 license = "Apache-2.0"
@@ -68,7 +68,7 @@ libtest = []
 anyhow = "1.0"
 vergen = { version = "8", features = [
     "cargo",
-    "git", 
+    "git",
     "gitoxide",
 ] }