From 3987d7ead0edf711dbed97c864044f34c8d6a868 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 17 Nov 2021 13:14:51 -0600
Subject: Extract do_flash_upgrade from tarfile in factory reset case

---
 .../mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
index a6e6d68..c6c3f08 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
+++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
@@ -95,8 +95,13 @@ if (( $tobeflashed )); then
         done
     fi
     mkdir -p /var/volatile/flash-upgrade
-    mv -f $upgrade /var/volatile/flash-upgrade/upgrade.bin
-    touch "${dofile}"
+    newbinfile=/var/volatile/flash-upgrade/upgrade.bin
+    mv -f $upgrade $newbinfile
+    if ((dofactoryreset == 1)) ; then
+        tar -xO -f "${newbinfile}" do_flash_upgrade >"$dofile"
+    else
+        touch "$dofile"
+    fi
     chown "root:root" "${dofile}" || true
     uid=$(stat -c %u "${dofile}") || true
     result=$?
-- 
cgit v1.2.3


From d003d67ff633f3d13fe5800be50b0a8724e941ee Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 18 Nov 2021 04:10:32 -0600
Subject: Do not bother with MD5SUM checks in factory upgrade, since umountfs
 does it too

---
 .../mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
index c6c3f08..360b553 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
+++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
@@ -68,9 +68,11 @@ for (( i = 0; i < ${#files[@]}; i++ )); do
             logger -s -t firmware_upgrade "MD5 is not found for the $file, upgrade aborted"
             exit 1
         fi
-        if ! tar -xO -f $upgrade $file | md5sum -c $file.md5; then
-            logger -s -t firmware_upgrade "MD5 check failed, upgrade aborted"
-            exit 1
+        if ((dofactoryreset == 0)) ; then
+            if ! tar -xO -f $upgrade $file | md5sum -c $file.md5; then
+                logger -s -t firmware_upgrade "MD5 check failed, upgrade aborted"
+                exit 1
+            fi
         fi
         tobeflashed=1
     fi
-- 
cgit v1.2.3


From 2f418b2b6e7d0c28cd95b4e4b50dab0402e0370a Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 21 Dec 2021 11:26:26 -0600
Subject: Remove ppp-waitforresetfunc, functionality now in package
 mts-id-eeprom

---
 recipes-core/images/mlinux-minimal-image.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 3337b89..0cf4c92 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -35,7 +35,7 @@ CORE_FEATURES_append_mtcap = " mt-dt-overlay "
 CORE_FEATURES_append_mtrv1 = " mt-dt-overlay "
 CORE_FEATURES_append_mtcdt = " mt-dt-overlay "
 
-NETWORKING_FEATURES = "ppp ppp-waitforresetfunc curl iproute2 \
+NETWORKING_FEATURES = "ppp curl iproute2 \
                        iptables iputils \
                        "
 
-- 
cgit v1.2.3