From b4200f4b7755b59ece92fc8eaeac4c9ac6bf26f3 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Mon, 18 Mar 2024 14:25:10 -0700
Subject: [PATCH] slightly better names

---
 Jenkinsfile                                            |  4 ++--
 release/README.md                                      |  6 +++---
 release/build_casync_channel.sh                        |  4 ++--
 release/build_git_channel.sh                           |  2 +-
 .../{copy_release_files.sh => copy_channel_files.sh}   |  0
 release/create_prebuilt.sh                             | 10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename release/{copy_release_files.sh => copy_channel_files.sh} (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 50ab151509..535b29a0e4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,8 +151,8 @@ def build_channel(String channel_name) {
     },
     "${channel_name} (casync)": {
       deviceStage("build casync", "tici-needs-can", [], [
-        ["build ${channel_name}", "BUILD_DIR=/data/openpilot_build OUTPUT_DIR=/data/casync RELEASE_CHANNEL=${channel_name} $SOURCE_DIR/release/build_casync_channel.sh"],
-        //["upload ${channel_name}", "RELEASE_CHANNEL=${channel_name} $SOURCE_DIR/release/upload_casync_channel.sh"],
+        ["build ${channel_name}", "BUILD_DIR=/data/openpilot_build OUTPUT_DIR=/data/casync OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/build_casync_channel.sh"],
+        //["upload ${channel_name}", "OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/upload_casync_channel.sh"],
       ])
     }
   )
diff --git a/release/README.md b/release/README.md
index 11c9d49c5b..4cbbe3329f 100644
--- a/release/README.md
+++ b/release/README.md
@@ -3,9 +3,9 @@
 
 ## terms
 
-`channel` - a named version of openpilot (git branches or casync caidx)<br>
+`channel` - a named version of openpilot with only required files for running openpilot and identifying the channel<br>
 `prebuilt` - a channel prebuilt for the tici, no building required on device<br>
-`release` - a channel that is prebuilt and also has `ALLOW_DEBUG` false. (`nightly`, `release3`)<br>
+`release` - prebuilt with `ALLOW_DEBUG` false (RELEASE=1 when building panda). (`nightly`, `release3`)<br>
 
 ## creating casync channel
 
@@ -17,7 +17,7 @@
 # and other casync files into CASYNC_DIR for uploading to openpilot-channels
 BUILD_DIR=/data/openpilot_build    \
 CASYNC_DIR=/data/casync            \
-RELEASE_CHANNEL=nightly            \
+OPENPILOT_CHANNEL=nightly            \
 release/build_casync_channel.sh
 ```
 
diff --git a/release/build_casync_channel.sh b/release/build_casync_channel.sh
index 07313082e6..87f70f5bfc 100755
--- a/release/build_casync_channel.sh
+++ b/release/build_casync_channel.sh
@@ -14,8 +14,8 @@ mkdir -p $CASYNC_DIR
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 
-release/copy_release_files.sh $SOURCE_DIR $BUILD_DIR
+release/copy_channel_files.sh $SOURCE_DIR $BUILD_DIR
 release/create_prebuilt.sh $BUILD_DIR
 
 cd $SOURCE_DIR
-release/create_casync_channel.py $BUILD_DIR $CASYNC_DIR $RELEASE_CHANNEL
+release/create_casync_channel.py $BUILD_DIR $CASYNC_DIR $OPENPILOT_CHANNEL
diff --git a/release/build_git_channel.sh b/release/build_git_channel.sh
index de4e0b7076..951a699b7f 100755
--- a/release/build_git_channel.sh
+++ b/release/build_git_channel.sh
@@ -23,7 +23,7 @@ git checkout --orphan $RELEASE_BRANCH
 # do the files copy
 echo "[-] copying files T=$SECONDS"
 cd $SOURCE_DIR
-release/copy_release_files.sh $SOURCE_DIR $BUILD_DIR
+release/copy_channel_Files.sh $SOURCE_DIR $BUILD_DIR
 
 cd $BUILD_DIR
 VERSION=$(cat common/version.h | awk -F[\"-]  '{print $2}')
diff --git a/release/copy_release_files.sh b/release/copy_channel_files.sh
similarity index 100%
rename from release/copy_release_files.sh
rename to release/copy_channel_files.sh
diff --git a/release/create_prebuilt.sh b/release/create_prebuilt.sh
index a7f53d2b52..bae8ae065b 100755
--- a/release/create_prebuilt.sh
+++ b/release/create_prebuilt.sh
@@ -6,17 +6,17 @@ set -ex
 
 BUILD_DIR=$1
 
-rm -f panda/board/obj/panda.bin.signed
-rm -f panda/board/obj/panda_h7.bin.signed
-
 cd $BUILD_DIR
 
 # Build
 export PYTHONPATH="$BUILD_DIR"
 scons -j$(nproc)
 
-# release panda fw
-CERT=/data/pandaextra/certs/release RELEASE=1 scons -j$(nproc) panda/
+if [ -n "$RELEASE" ]; then
+  rm -f panda/board/obj/panda.bin.signed
+  rm -f panda/board/obj/panda_h7.bin.signed
+  CERT=/data/pandaextra/certs/release scons -j$(nproc) panda/
+fi
 
 # Cleanup
 find . -name '*.a' -delete