fuchsia_build: Prevent signing scripts from deleting TMPDIR The vendor signing scripts 'sign-boot-g12a.sh' and 'sign-boot-g12a-dev.sh' deleted the $TMP directory on exit, causing subsequent 'mktemp' calls in 'efuse-gen.sh' to fail. Comment out the directory removal in these scripts. They still clean up their own temp files. Also revert the incorrect workaround in 'fip/c1/build.sh'. Bug: 435534715 TAG=agy CONV=a991dad9-800d-4aff-bf0b-11117211f921 Change-Id: Icc7399ab57168885ace800d04c25e59ed22e07ac Reviewed-on: https://turquoise-internal-review.googlesource.com/c/third_party/u-boot/+/1355151 Commit-Queue: David Pursell <dpursell@google.com> Reviewed-by: David Pursell <dpursell@google.com> GitOrigin-RevId: 03a819d3ab014f31d69107c339c912f231305f0c
diff --git a/fip/c1/build.sh b/fip/c1/build.sh index b4fcdef..2e6b3c1 100644 --- a/fip/c1/build.sh +++ b/fip/c1/build.sh
@@ -89,7 +89,7 @@ function encrypt_step() { dbg "encrypt: $@" local ret=0 - TMPDIR="${TMPDIR}/aml_${CURSOC}_tmp"./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@ + ./${FIP_FOLDER}${CUR_SOC}/aml_encrypt_${CUR_SOC} $@ ret=$? if [ 0 != $ret ]; then echo "Err! aml_encrypt_${CUR_SOC} return $ret"
diff --git a/fip/stool/signing-tool-g12a-dev/sign-boot-g12a-dev.sh b/fip/stool/signing-tool-g12a-dev/sign-boot-g12a-dev.sh index dc7c9c8..24ac092 100755 --- a/fip/stool/signing-tool-g12a-dev/sign-boot-g12a-dev.sh +++ b/fip/stool/signing-tool-g12a-dev/sign-boot-g12a-dev.sh
@@ -1149,7 +1149,7 @@ for i in $tmpfiles ; do rm -f $TMP/$i done - rmdir $TMP || true + # rmdir $TMP || true } trap cleanup EXIT
diff --git a/fip/stool/signing-tool-g12a/sign-boot-g12a.sh b/fip/stool/signing-tool-g12a/sign-boot-g12a.sh index 1280f5a..0cf8124 100755 --- a/fip/stool/signing-tool-g12a/sign-boot-g12a.sh +++ b/fip/stool/signing-tool-g12a/sign-boot-g12a.sh
@@ -2100,7 +2100,7 @@ for i in $tmpfiles ; do rm -f $TMP/$i done - rm -fr $TMP + # rm -fr $TMP } trap cleanup EXIT