summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2024-07-14 11:36:28 +0200
committerSteve Sakoman <steve@sakoman.com>2024-08-06 19:11:18 -0700
commitfc596da0c27f5c6ac65ba3e8fd19e5260014f544 (patch)
treefe2aef977a7dd618a4be534cce78f175b7b55409
parentf43f393ef0246b7bee6eed8bcf8271cf2b8cdf40 (diff)
downloadpoky-fc596da0c27f5c6ac65ba3e8fd19e5260014f544.tar.gz
libstd-rs,rust-cross-canadian: set CVE_PRODUCT to rust
These recipes come from rust sources and CVEs are reported for them under rust-lang:rust vendor:product touple. Especially libstd-rs needs correct CVE_PRODUCT as is it installed on target devices (being statically linked to rust compiled binaries). before: cargo: CVE_PRODUCT="cargo" cargo-c-native: CVE_PRODUCT="cargo-c" libstd-rs: CVE_PRODUCT="libstd-rs" rust: CVE_PRODUCT="rust" rust-cross-canadian: CVE_PRODUCT="rust-cross-canadian-<arch>" rust-llvm: CVE_PRODUCT="rust-llvm" after: cargo: CVE_PRODUCT="cargo" cargo-c-native: CVE_PRODUCT="cargo-c" libstd-rs: CVE_PRODUCT="rust" rust: CVE_PRODUCT="rust" rust-cross-canadian-x86-64: CVE_PRODUCT="rust" rust-llvm: CVE_PRODUCT="rust-llvm" Product for rust-llvm is uncertain and, should be handled in another commit if it is desired to align it, too. sqlite> select vendor, product, count(product) from products where vendor="rust-lang" group by product; rust-lang|async-h1|2 rust-lang|cargo|5 rust-lang|future-utils|2 rust-lang|futures-task|2 rust-lang|mdbook|1 rust-lang|regex|2 rust-lang|rsa|2 rust-lang|rust|45 rust-lang|socket2|1 (From OE-Core rev: 91bfe1f64ee3e2b8534baa8a3eb2fb7fa3521657) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e8cf1df16a6ec2785cacaf608bec5cd8496103af) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-devtools/rust/libstd-rs_1.75.0.bb2
-rw-r--r--meta/recipes-devtools/rust/rust-cross-canadian.inc1
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
index d2bf266f9d..fe016e72d4 100644
--- a/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
+++ b/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
@@ -15,6 +15,8 @@ S = "${RUSTSRC}/library/sysroot"
15RUSTLIB_DEP = "" 15RUSTLIB_DEP = ""
16inherit cargo 16inherit cargo
17 17
18CVE_PRODUCT = "rust"
19
18DEPENDS:append:libc-musl = " libunwind" 20DEPENDS:append:libc-musl = " libunwind"
19# rv32 does not have libunwind ported yet 21# rv32 does not have libunwind ported yet
20DEPENDS:remove:riscv32 = "libunwind" 22DEPENDS:remove:riscv32 = "libunwind"
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index 7bfef6d175..8a51a02293 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -1,5 +1,6 @@
1SUMMARY = "Rust compiler and runtime libaries (cross-canadian for ${TARGET_ARCH} target)" 1SUMMARY = "Rust compiler and runtime libaries (cross-canadian for ${TARGET_ARCH} target)"
2PN = "rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" 2PN = "rust-cross-canadian-${TRANSLATED_TARGET_ARCH}"
3CVE_PRODUCT = "rust"
3 4
4inherit rust-target-config 5inherit rust-target-config
5inherit rust-common 6inherit rust-common