From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 23 Jul 2022 12:41:38 +0000 (+0100)
Subject: rust-target-config: Create new class to contain target json config generation
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3795285cbf362e13b8151bfdbe1bce999ac28641;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rust-target-config: Create new class to contain target json config generation

Currently most of the rust recipes use this code but it is all piecemeal.
Turn the code into a class where things can start to be rationalised. Ultimately
some of the data and python code should be moved to a python library but one step
at a time.

No functionality changes.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/classes/rust-target-config.bbclass
similarity index 99%
rename from meta/recipes-devtools/rust/rust-common.inc
rename to meta/classes/rust-target-config.bbclass
index 2edc71e0d32..4db91d36d53 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/classes/rust-target-config.bbclass
@@ -1,4 +1,3 @@
-
 # Right now this is focused on arm-specific tune features.
 # We get away with this for now as one can only use x86-64 as the build host
 # (not arm).
diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
index d12267db3d5..e83b6a67b3b 100644
--- a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
+++ b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
@@ -5,7 +5,7 @@ RUST_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config"
 HOST_SYS = "${HOST_ARCH}-unknown-linux-gnu"
 CARGO_RUST_TARGET_CCLD = "${RUST_BUILD_CCLD}"
 
-require recipes-devtools/rust/rust-common.inc
+inherit rust-target-config
 require cargo.inc
 
 CARGO = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index ea716d31f2c..ecb057ad3b5 100644
--- a/meta/recipes-devtools/rust/rust.inc
+++ b/meta/recipes-devtools/rust/rust.inc
@@ -39,7 +39,7 @@ setup_cargo_environment () {
     printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config
 }
 
-include rust-common.inc
+inherit rust-target-config
 
 do_rust_setup_snapshot () {
     for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do