From 3e6b1bb2797db819d4845d4486e781e10ade5b05 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Fri, 26 Jan 2024 22:36:56 +0100
Subject: [PATCH] optimize

---
 build.sh          |  2 +-
 scripts/common.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index b8acfbd..e00ab14 100755
--- a/build.sh
+++ b/build.sh
@@ -279,7 +279,7 @@ if [[ "${PLATFORM}" == "pi" ]]; then
     # kernel build. this is a temporary thing due to the unique issues with USB on the pi zero.
     fetch_SBC_source
     ls -a
-set -x 
+    set -x 
     echo $(pwd)
          ##veye v4l2
          git clone https://github.com/veyeimaging/raspberrypi_v4l2 workdir/mods/raspberrypi_v4l2 || exit 1
diff --git a/scripts/common.sh b/scripts/common.sh
index 4ebd823..95ad5c4 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -17,7 +17,13 @@ function init() {
 }
 
 function package() {
+    echo "Start Packaging"
+    echo ${PLATFORM}
+    if [[ "${PI4}" == "true" ]]; then
+    PACKAGE_NAME=openhd-linux-V7l-${PLATFORM}
+    else
     PACKAGE_NAME=openhd-linux-${PLATFORM}
+    fi
 
     VERSION="2.5-evo-$(date '+%m%d%H%M')-$(git rev-parse --short HEAD)"
 
@@ -28,13 +34,7 @@ function package() {
         rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.74-v7+/build
         rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.74-v7l+/source
         rm -Rf ${PACKAGE_DIR}/lib/modules/6.1.74-v7l+/build
-        if [[ "${PI4}" == "true" ]]; then
-        fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME}-v7l -v ${VERSION} -C ${PACKAGE_DIR} \
-            --after-install after-install.sh \
-            --before-install before-install.sh \
-            -p ${PACKAGE_NAME}_VERSION_ARCH.deb || exit 1
-        else
-        fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME}-v7 -v ${VERSION} -C ${PACKAGE_DIR} \
+        fpm -a ${PACKAGE_ARCH} -s dir -t deb -n ${PACKAGE_NAME} -v ${VERSION} -C ${PACKAGE_DIR} \
             --after-install after-install.sh \
             --before-install before-install.sh \
             -p ${PACKAGE_NAME}_VERSION_ARCH.deb || exit 1