From 51ac84705cab3b76d438d42ba9a90d324cd66d87 Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:57:31 -0500
Subject: [PATCH] Update sdxpinn-patch

- Added a fix to ensure mount-fix does not have a prerm to run

- Added a custom arch index for opkg

- Updated quecmanager beta to have a depend on inotifywait since mount-fix no longer has the depend.
---
 ipk-source/sdxpinn-patch/CONTROL/control      |  2 +-
 ipk-source/sdxpinn-patch/CONTROL/preinst      | 26 ++++++++++++++++++-
 .../sdxpinn-patch/root/tmp/sdxpinn.patched    |  2 +-
 .../sdxpinn-quecmanager-beta/CONTROL/control  |  2 +-
 opkg-feed/Packages                            |  2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ipk-source/sdxpinn-patch/CONTROL/control b/ipk-source/sdxpinn-patch/CONTROL/control
index 7785cca..0ba167e 100755
--- a/ipk-source/sdxpinn-patch/CONTROL/control
+++ b/ipk-source/sdxpinn-patch/CONTROL/control
@@ -1,6 +1,6 @@
 Package: sdxpinn-patch
 Depends: sdxpinn-mount-fix
-Version: 1
+Version: 2
 Architecture: all
 Maintainer: Cameron Thompson iamromulan@github.com
 Source: github.com/iamromulan
diff --git a/ipk-source/sdxpinn-patch/CONTROL/preinst b/ipk-source/sdxpinn-patch/CONTROL/preinst
index db099e5..f9e34da 100755
--- a/ipk-source/sdxpinn-patch/CONTROL/preinst
+++ b/ipk-source/sdxpinn-patch/CONTROL/preinst
@@ -162,6 +162,24 @@ repo_iamromulanSDXPINN_check() {
     return 0
 }
 
+opkg_arch_patch() {
+if [ ! -f /etc/opkg/arch.conf ]; then
+ cat > /etc/opkg/arch.conf << 'EOF'
+arch all 1
+arch noarch 1
+arch sdxpinn 2
+arch aarch64_cortex-a53 10
+arch aarch64_generic 20
+EOF
+else
+ for arch in "all 1" "noarch 1" "sdxpinn 2" "aarch64_cortex-a53 10" "aarch64_generic 20"; do
+   if ! grep -q "^arch $arch$" /etc/opkg/arch.conf; then
+     echo "arch $arch" >> /etc/opkg/arch.conf
+   fi
+ done
+fi
+}
+
 
 # Begin Patch Process 
 echo -e "\e[92mBegining sdxpinn-patch process...\e[0m"
@@ -170,6 +188,12 @@ clean_distfeeds
 echo -e "\e[92mEnsuring iamromulan's SDXPINN repo is listed in customfeeds and public key is installed...\e[0m"
 repo_iamromulanSDXPINN_check
 echo -e "\e[92miamromulan's SDXPINN repo source and key is installed.\e[0m"
-
+echo -e "\e[92mEnsuring mount-fix does not have a prerm\e[0m"
+mount -o remount,rw /real_rootfs
+rm /real_rootfs/usr/lib/opkg/info/sdxpinn-mount-fix.prerm
+mount -o remount,ro /real_rootfs
+rm /usr/lib/opkg/info/sdxpinn-mount-fix.prerm
+echo -e "\e[92mEnsuring opkg reconizes needed archs\e[0m"
+opkg_arch_patch
 echo -e "\e[92msdxpinn-patch process complete.\e[0m"
 exit 0
diff --git a/ipk-source/sdxpinn-patch/root/tmp/sdxpinn.patched b/ipk-source/sdxpinn-patch/root/tmp/sdxpinn.patched
index d00491f..0cfbf08 100644
--- a/ipk-source/sdxpinn-patch/root/tmp/sdxpinn.patched
+++ b/ipk-source/sdxpinn-patch/root/tmp/sdxpinn.patched
@@ -1 +1 @@
-1
+2
diff --git a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control
index 59f373b..88b5e76 100755
--- a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control
+++ b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control
@@ -4,5 +4,5 @@ Architecture: aarch64_cortex-a53
 Maintainer: Russel Yasol dr-dolomite@github.com Cameron Thompson iamromulan@github.com
 Source: github.com/iamromulan
 Description: A custom web UI desgined to run alongside luci for Quectel RM55x modems
-Depends: sdxpinn-mount-fix, libc, coreutils-timeout, uhttpd, sms-tool (>= 2025.1.19-APmod-iamromulan), jq, ookla-speedtest
+Depends: sdxpinn-mount-fix, libc, inotifywait, coreutils-timeout, uhttpd, sms-tool (>= 2025.1.19-APmod-iamromulan), jq, ookla-speedtest
 Conflicts: sdxpinn-quecmanager
diff --git a/opkg-feed/Packages b/opkg-feed/Packages
index 085f01f..5df6caf 100644
--- a/opkg-feed/Packages
+++ b/opkg-feed/Packages
@@ -112,7 +112,7 @@ License: GPLv3
 
 Package: sdxpinn-quecmanager-beta
 Version: 1.1.1-2
-Depends: sdxpinn-mount-fix, libc, coreutils-timeout, uhttpd, sms-tool (>= 2025.1.19-APmod-iamromulan), jq, ookla-speedtest
+Depends: sdxpinn-mount-fix, libc, inotifywait, coreutils-timeout, uhttpd, sms-tool (>= 2025.1.19-APmod-iamromulan), jq, ookla-speedtest
 Conflicts: sdxpinn-quecmanager
 Section: admin
 Architecture: aarch64_cortex-a53