fixup: revert future changes to dir vars

Opentrons · Dec 16, 2024 · 1da4691 · 1da4691
1 parent 7ad7c58
commit 1da4691
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/layers/meta-opentrons/classes/cargo_common.bbclass b/layers/meta-opentrons/classes/cargo_common.bbclass
@@ -16,7 +16,7 @@
 
 # add crate fetch support
 inherit rust-common
-
+UNPACKDIR ?= "${WORKDIR}"
 # Where we download our registry and dependencies to
 export CARGO_HOME = "${UNPACKDIR}/cargo_home"
 

diff --git a/layers/meta-opentrons/recipes-devtools/rust/cargo_1.75.0.bb b/layers/meta-opentrons/recipes-devtools/rust/cargo_1.75.0.bb
@@ -22,7 +22,7 @@ inherit cargo pkgconfig
 DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}"
 
 do_cargo_setup_snapshot () {
-	${UNPACKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
+	${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
 	# Need to use uninative's loader if enabled/present since the library paths
 	# are used internally by rust and result in symbol mismatches if we don't
 	if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then

diff --git a/layers/meta-opentrons/recipes-devtools/rust/rust_1.75.0.bb b/layers/meta-opentrons/recipes-devtools/rust/rust_1.75.0.bb
@@ -51,7 +51,7 @@ setup_cargo_environment () {
 inherit rust-target-config
 
 do_rust_setup_snapshot () {
-    for installer in "${UNPACKDIR}/rust-snapshot-components/"*"/install.sh"; do
+    for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do
         "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig
     done