From d1784c7954363d24eef73f7e49cbebf494bc2c10 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 23 Sep 2022 14:35:41 -0500
Subject: Remove erasure of /var/log/messages from Redpine scripts

---
 recipes-kernel/rs9113/files/rs9113/messages.patch | 131 ++++++++++++++++++++++
 recipes-kernel/rs9113/rs9113_1.6.5.bb             |   3 +-
 2 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/rs9113/files/rs9113/messages.patch

diff --git a/recipes-kernel/rs9113/files/rs9113/messages.patch b/recipes-kernel/rs9113/files/rs9113/messages.patch
new file mode 100644
index 0000000..abb7b18
--- /dev/null
+++ b/recipes-kernel/rs9113/files/rs9113/messages.patch
@@ -0,0 +1,131 @@
+diff -Naru orig/opt/rs9113/common_insert_bac.sh new/opt/rs9113/common_insert_bac.sh
+--- orig/opt/rs9113/common_insert_bac.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/common_insert_bac.sh	2022-09-23 13:00:32.357448790 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ #dmesg -c > /dev/null
+ #sh dump_msg.sh &
+ #dmesg -n 7
+diff -Naru orig/opt/rs9113/common_insert_flash.sh new/opt/rs9113/common_insert_flash.sh
+--- orig/opt/rs9113/common_insert_flash.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/common_insert_flash.sh	2022-09-23 13:00:38.981448635 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ #dmesg -c > /dev/null
+ #sh dump_msg.sh &
+ #dmesg -n 7
+diff -Naru orig/opt/rs9113/common_insert.sh new/opt/rs9113/common_insert.sh
+--- orig/opt/rs9113/common_insert.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/common_insert.sh	2022-09-23 13:00:43.421448531 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ #dmesg -c > /dev/null
+ #sh dump_msg.sh &
+ #dmesg -n 7
+diff -Naru orig/opt/rs9113/flash.sh new/opt/rs9113/flash.sh
+--- orig/opt/rs9113/flash.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/flash.sh	2022-09-23 13:00:50.241448371 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ #dmesg -c > /dev/null
+ #sh dump_msg.sh &
+ #dmesg -n 7
+diff -Naru orig/opt/rs9113/mbr_flash.sh new/opt/rs9113/mbr_flash.sh
+--- orig/opt/rs9113/mbr_flash.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/mbr_flash.sh	2022-09-23 13:00:55.621448245 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+
+ dmesg -c > /dev/null
+
+diff -Naru orig/opt/rs9113/onebox_insert.sh new/opt/rs9113/onebox_insert.sh
+--- orig/opt/rs9113/onebox_insert.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/onebox_insert.sh	2022-09-23 13:01:14.037447814 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ cmd=`lsmod | grep rsi_91x`
+ if [ "$cmd" ]; then
+ echo "Removing the Redpine open source kernel binaries";
+diff -Naru orig/opt/rs9113/per_lpbk.sh new/opt/rs9113/per_lpbk.sh
+--- orig/opt/rs9113/per_lpbk.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/per_lpbk.sh	2022-09-23 13:01:22.333447620 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+
+ insmod onebox_common_gpl.ko
+ #dmesg -c > /dev/null
+diff -Naru orig/opt/rs9113/sbl_upgrade.sh new/opt/rs9113/sbl_upgrade.sh
+--- orig/opt/rs9113/sbl_upgrade.sh	2022-09-23 12:54:31.289457239 -0500
++++ new/opt/rs9113/sbl_upgrade.sh	2022-09-23 13:01:26.317447527 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+
+ insmod onebox_common_gpl.ko
+
+diff -Naru orig/opt/rs9113/sniffer.sh new/opt/rs9113/sniffer.sh
+--- orig/opt/rs9113/sniffer.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/sniffer.sh	2022-09-23 13:01:30.965447418 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+ #dmesg -c > /dev/null
+ #sh dump_msg.sh &
+ #dmesg -n 7
+diff -Naru orig/opt/rs9113/start_p2pgo.sh new/opt/rs9113/start_p2pgo.sh
+--- orig/opt/rs9113/start_p2pgo.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/start_p2pgo.sh	2022-09-23 13:01:34.789447329 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ sh wlan_enable.sh
+ ./onebox_util rpine0 create_vap wifi0 p2p_go
+ wpa_supplicant -i wifi0 -D nl80211 -c p2p_nl80211.conf -ddddt > log &
+diff -Naru orig/opt/rs9113/start_p2p_nl80211.sh new/opt/rs9113/start_p2p_nl80211.sh
+--- orig/opt/rs9113/start_p2p_nl80211.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/start_p2p_nl80211.sh	2022-09-23 13:01:38.661447238 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ sh wlan_enable.sh
+ ./onebox_util rpine0 create_vap wifi0 p2p
+ wpa_supplicant -i wifi0 -D nl80211 -c p2p_nl80211.conf -ddddt > log &
+diff -Naru orig/opt/rs9113/start_p2p.sh new/opt/rs9113/start_p2p.sh
+--- orig/opt/rs9113/start_p2p.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/start_p2p.sh	2022-09-23 13:01:48.133447017 -0500
+@@ -1,5 +1,4 @@
+
+-cat /dev/null > /var/log/messages
+ sh wlan_enable.sh
+ ./onebox_util rpine0 create_vap wifi0 p2p
+ ./wpa_supplicant -i wifi0 -D bsd -c p2p.conf -ddddt > log &
+diff -Naru orig/opt/rs9113/start_per.sh new/opt/rs9113/start_per.sh
+--- orig/opt/rs9113/start_per.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/start_per.sh	2022-09-23 13:01:52.961446904 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+
+ insmod onebox_common_gpl.ko
+
+diff -Naru orig/opt/rs9113/start_sta.sh new/opt/rs9113/start_sta.sh
+--- orig/opt/rs9113/start_sta.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/start_sta.sh	2022-09-23 13:01:56.925446811 -0500
+@@ -1,4 +1,3 @@
+-cat /dev/null > /var/log/messages
+ sh wlan_enable.sh
+ ./onebox_util rpine0 create_vap wifi0 sta sw_bmiss
+ ./wpa_supplicant -i wifi0 -D bsd -c sta_settings.conf -ddddt > log1 &
+diff -Naru orig/opt/rs9113/upgrade.sh new/opt/rs9113/upgrade.sh
+--- orig/opt/rs9113/upgrade.sh	2022-09-23 12:54:31.293457239 -0500
++++ new/opt/rs9113/upgrade.sh	2022-09-23 13:03:09.097445122 -0500
+@@ -16,7 +16,6 @@
+ echo -e "\033[31mEntered into Upgrade Mode....\033[0m"
+ echo -e "\033[31mInserting .kos with Driver Mode 5....\033[0m"
+
+-cat /dev/null > /var/log/messages
+ insmod onebox_common_gpl.ko
+
+ insmod wlan.ko
diff --git a/recipes-kernel/rs9113/rs9113_1.6.5.bb b/recipes-kernel/rs9113/rs9113_1.6.5.bb
index 6f0f78a..d2643d9 100644
--- a/recipes-kernel/rs9113/rs9113_1.6.5.bb
+++ b/recipes-kernel/rs9113/rs9113_1.6.5.bb
@@ -17,7 +17,7 @@ COMPATIBLE_MACHINE = "(mtcdt|mtrv1)"
 # To update this, manually copy ipk from Jenkin's job to
 #     git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV}
 #
-PR = "r17"
+PR = "r18"
 PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 SRC_URI = " \
     file://rs9113/rs9113.init \
@@ -26,6 +26,7 @@ SRC_URI = " \
     file://rs9113/mts-rm-rs9113 \
     file://rs9113/wpa_supplicant \
     file://rs9113-ipk/rs9113-from-src_${PV}-${PKGR}.0_${MACHINE}.ipk;name=binaries \
+    file://rs9113/messages.patch;patchdir=${WORKDIR} \
 "
 SRCREV = "${PV}"
 
-- 
cgit v1.2.3