From a7ec9933c8ef191ed73e204770acb61c23136146 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sat, 5 Aug 2023 16:56:30 -0700
Subject: [PATCH] build_release: simplify panda building (#29252)

* build_release: simplify panda building

* cleanup
old-commit-hash: 1e3bb5be7ec3cd00a2ff8c8a7bc02b8efbf1cddc
---
 release/build_release.sh | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/release/build_release.sh b/release/build_release.sh
index 6416b14a2a..b713876cd6 100755
--- a/release/build_release.sh
+++ b/release/build_release.sh
@@ -52,18 +52,13 @@ echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
 git commit -a -m "openpilot v$VERSION release"
 
-# Build panda firmware
-pushd panda/
-CERT=/data/pandaextra/certs/release RELEASE=1 scons -u .
-rm -rf /tmp/panda_obj/
-mkdir /tmp/panda_obj/
-mv board/obj/panda.bin.signed board/obj/panda_h7.bin.signed board/obj/bootstub.panda.bin board/obj/bootstub.panda_h7.bin /tmp/panda_obj/
-popd
-
 # Build
 export PYTHONPATH="$BUILD_DIR"
 scons -j$(nproc)
 
+# release panda fw
+CERT=/data/pandaextra/certs/release RELEASE=1 scons -j$(nproc) panda/
+
 # Ensure no submodules in release
 if test "$(git submodule--helper list | wc -l)" -gt "0"; then
   echo "submodules found:"
@@ -79,14 +74,9 @@ find . -name '*.os' -delete
 find . -name '*.pyc' -delete
 find . -name 'moc_*' -delete
 find . -name '__pycache__' -delete
-rm -rf panda/board panda/certs panda/crypto
 rm -rf .sconsign.dblite Jenkinsfile release/
 rm selfdrive/modeld/models/supercombo.onnx
 
-# Move back signed panda fw
-mkdir -p panda/board/obj
-mv /tmp/panda_obj/* panda/board/obj/
-
 # Restore third_party
 git checkout third_party/