MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cargo_common: use 'config.toml' instead of plain 'config'

Browse Source 
cargo configuration has been renamed from plain 'config' to
'config.toml' in rust-1.38.

Using the old name is still supported but creates warnings like

| $ cargo
| warning: `/sdk.../home/cargo/config` is deprecated in favor of `config.toml`
| note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`

Use the new name.

(From OE-Core rev: 94b7d1a6cdb44949f8a96213ff2e45fafd759442)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Enrico Scholz 2025-02-21 14:58:38 +01:00 committed by Richard Purdie
parent cf8b4459a5
commit 5fe47418ba
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes-recipe/cargo_common.bbclass
View File

@ -47,14 +47,14 @@ CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
cat <<- EOF > ${CARGO_HOME}/config
cat <<- EOF > ${CARGO_HOME}/config.toml
# EXTRA_OECARGO_PATHS
paths = [
$(for p in ${EXTRA_OECARGO_PATHS}; do echo \"$p\",; done)
]
EOF
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
# Local mirror vendored by bitbake
[source.bitbake]
@ -62,7 +62,7 @@ cargo_common_do_configure () {
EOF
if [ ${CARGO_DISABLE_BITBAKE_VENDORING} = "0" ]; then
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
[source.crates-io]
replace-with = "bitbake"
@ -70,7 +70,7 @@ cargo_common_do_configure () {
EOF
fi
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
[http]
# Multiplexing can't be enabled because http2 can't be enabled
@ -82,7 +82,7 @@ cargo_common_do_configure () {
EOF
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
# HOST_SYS
[target.${RUST_HOST_SYS}]
@ -90,7 +90,7 @@ cargo_common_do_configure () {
EOF
if [ "${RUST_HOST_SYS}" != "${RUST_BUILD_SYS}" ]; then
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
# BUILD_SYS
[target.${RUST_BUILD_SYS}]
@ -99,7 +99,7 @@ cargo_common_do_configure () {
fi
if [ "${RUST_TARGET_SYS}" != "${RUST_BUILD_SYS}" -a "${RUST_TARGET_SYS}" != "${RUST_HOST_SYS}" ]; then
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
# TARGET_SYS
[target.${RUST_TARGET_SYS}]
@ -110,7 +110,7 @@ cargo_common_do_configure () {
# Put build output in build directory preferred by bitbake instead of
# inside source directory unless they are the same
if [ "${B}" != "${S}" ]; then
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
[build]
# Use out of tree build destination to avoid polluting the source tree
@ -118,7 +118,7 @@ cargo_common_do_configure () {
EOF
fi
cat <<- EOF >> ${CARGO_HOME}/config
cat <<- EOF >> ${CARGO_HOME}/config.toml
[term]
progress.when = 'always'
@ -129,7 +129,7 @@ cargo_common_do_configure () {
python cargo_common_do_patch_paths() {
import shutil
cargo_config = os.path.join(d.getVar("CARGO_HOME"), "config")
cargo_config = os.path.join(d.getVar("CARGO_HOME"), "config.toml")
if not os.path.exists(cargo_config):
return