1 files changed, 15 insertions, 15 deletions

diff --git a/meta/classes-recipe/cargo_common.bbclass b/meta/classes-recipe/cargo_common.bbclass
index 0fb443edbd..c9eb2d09a5 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -18,7 +18,7 @@
 inherit rust-common
 
 # Where we download our registry and dependencies to
-export CARGO_HOME = "${WORKDIR}/cargo_home"
+export CARGO_HOME = "${UNPACKDIR}/cargo_home"
 
 # The pkg-config-rs library used by cargo build scripts disables itself when
 # cross compiling unless this is defined. We set up pkg-config appropriately
@@ -41,20 +41,20 @@ CARGO_SRC_DIR ??= ""
 CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
 # Path to Cargo.lock
-CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)), 'Cargo.lock')}"
+CARGO_LOCK_PATH ??= "${@ os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH')), 'Cargo.lock')}"
 
 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
 
@@ -138,11 +138,11 @@ python cargo_common_do_patch_paths() {
         return
 
     patches = dict()
-    workdir = d.getVar('WORKDIR')
+    workdir = d.getVar('UNPACKDIR')
     fetcher = bb.fetch2.Fetch(src_uri, d)
     for url in fetcher.urls:
         ud = fetcher.ud[url]
-        if ud.type == 'git':
+        if ud.type == 'git' or ud.type == 'gitsm':
             name = ud.parm.get('name')
             destsuffix = ud.parm.get('destsuffix')
             if name is not None and destsuffix is not None:
@@ -171,7 +171,7 @@ python cargo_common_do_patch_paths() {
     # here is better than letting cargo tell (in case the file is missing)
     # "Cargo.lock should be modified but --frozen was given"
 
-    lockfile = d.getVar("CARGO_LOCK_PATH", True)
+    lockfile = d.getVar("CARGO_LOCK_PATH")
     if not os.path.exists(lockfile):
         bb.fatal(f"{lockfile} file doesn't exist")