From 0dee9d1ebe4359ae11d90d35fb0e3e59556b620c Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Sat, 2 Mar 2024 11:31:24 +0100
Subject: [PATCH] tree: some rewrites

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/include/modules.sh             |   2 +-
 files/initrd/opt/arc/ramdisk-patch.sh               |   6 ++++++
 files/initrd/opt/arc/zimage-patch.sh                |   6 +++---
 .../{bzImage.gz => bzImage-epyc7002-7.2-5.10.55.gz} | Bin
 ...modules.tgz => modules-epyc7002-7.2-5.10.55.tgz} | Bin
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename files/p3/custom/{bzImage.gz => bzImage-epyc7002-7.2-5.10.55.gz} (100%)
 rename files/p3/custom/{modules.tgz => modules-epyc7002-7.2-5.10.55.tgz} (100%)

diff --git a/files/initrd/opt/arc/include/modules.sh b/files/initrd/opt/arc/include/modules.sh
index 6aff77a4..46ead1e8 100755
--- a/files/initrd/opt/arc/include/modules.sh
+++ b/files/initrd/opt/arc/include/modules.sh
@@ -50,7 +50,7 @@ function installModules() {
   mkdir -p "${TMP_PATH}/modules"
   local KERNEL="$(readConfigKey "arc.kernel" "${USER_CONFIG_FILE}")"
   if [ "${KERNEL}" = "custom" ]; then
-    tar -zxf "${CUSTOM_PATH}/modules.tgz" -C "${TMP_PATH}/modules"
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
   else
     tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
   fi
diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh
index 81e2b466..0dac8805 100755
--- a/files/initrd/opt/arc/ramdisk-patch.sh
+++ b/files/initrd/opt/arc/ramdisk-patch.sh
@@ -201,6 +201,12 @@ if [ "${PLATFORM}" = "epyc7002" ]; then
   sed -i '/^echo "START/a \\nmknod -m 0666 /dev/console c 1 3' ${RAMDISK_PATH}/linuxrc.syno
 fi
 
+# Broadwellntbap patches
+if [ "${PLATFORM}" = "broadwellntbap" ]; then
+  echo -e "Apply Broadwellntbap Fixes"
+  sed -i 's/IsUCOrXA="yes"/XIsUCOrXA="yes"/g; s/IsUCOrXA=yes/XIsUCOrXA=yes/g' ${RAMDISK_PATH}/usr/syno/share/environments.sh
+fi
+
 # Call user patch scripts
 for F in $(ls -1 ${SCRIPTS_PATH}/*.sh 2>/dev/null); do
   echo "Calling ${F}" >>"${LOG_FILE}" 2>&1
diff --git a/files/initrd/opt/arc/zimage-patch.sh b/files/initrd/opt/arc/zimage-patch.sh
index 232f7303..15665e3e 100755
--- a/files/initrd/opt/arc/zimage-patch.sh
+++ b/files/initrd/opt/arc/zimage-patch.sh
@@ -9,19 +9,19 @@ set -o pipefail # Get exit code from process piped
 # Sanity check
 [ -f "${ORI_ZIMAGE_FILE}" ] || (die "${ORI_ZIMAGE_FILE} not found!" | tee -a "${LOG_FILE}")
 
-echo -e "Patching zImage"
-
 rm -f "${MOD_ZIMAGE_FILE}"
 
 KERNEL="$(readConfigKey "arc.kernel" "${USER_CONFIG_FILE}")"
 if [ "${KERNEL}" = "custom" ]; then
+  echo -e "Using customized zImage"
   MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
   PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
   PLATFORM="$(readModelKey "${MODEL}" "platform")"
   KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")"
   # Extract bzImage
-  gzip -dc "${CUSTOM_PATH}/bzImage.gz" >"${MOD_ZIMAGE_FILE}"
+  gzip -dc "${CUSTOM_PATH}/bzImage-${PLATFORM}-${PRODUCTVER}-${KVER}.gz" >"${MOD_ZIMAGE_FILE}"
 else
+  echo -e "Patching zImage"
   # Extract vmlinux
   ${ARC_PATH}/bzImage-to-vmlinux.sh "${ORI_ZIMAGE_FILE}" "${TMP_PATH}/vmlinux" >"${LOG_FILE}" 2>&1 || dieLog
   # Patch boot params and ramdisk check
diff --git a/files/p3/custom/bzImage.gz b/files/p3/custom/bzImage-epyc7002-7.2-5.10.55.gz
similarity index 100%
rename from files/p3/custom/bzImage.gz
rename to files/p3/custom/bzImage-epyc7002-7.2-5.10.55.gz
diff --git a/files/p3/custom/modules.tgz b/files/p3/custom/modules-epyc7002-7.2-5.10.55.tgz
similarity index 100%
rename from files/p3/custom/modules.tgz
rename to files/p3/custom/modules-epyc7002-7.2-5.10.55.tgz