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

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.

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>

diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass
index c528ae7f39d2bc1980d0fccbfefc6c619d7952ef..c9eb2d09a522d57c8a96464a810cfbce33ee35f6 100644 (file)
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -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