Merge pull request #397 from cakre/mender4-support-2

Fix Mender 4 on jetpack 5
mendersoftware · Aug 2, 2024 · 8280a10 · 8280a10
2 parents b4aa269 + 3a7e212
commit 8280a10
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/u-boot/libubootenv-fake/fw_printenv b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/u-boot/libubootenv-fake/fw_printenv
@@ -51,7 +51,11 @@ while [ -n "$1" ]; do
             else
                 echo "0"
             fi
-           ;;
+            ;;
+        mender_check_saveenv_canary)
+            [ -n "$quiet" ] || echo -n "$1="
+            echo "0"
+            ;;
         *)
            echo "ERR: no such variable: $1" >&2
            exit 1

diff --git a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/u-boot/libubootenv-fake/fw_setenv b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-bsp/u-boot/libubootenv-fake/fw_setenv
@@ -9,5 +9,11 @@ if [ "$1" = "-s" ]; then
 	    fi
 	fi
     done
+elif [ "$1" = "upgrade_available" ]; then
+    if [ "$2" = "1" ]; then
+        touch /var/lib/mender/upgrade_available
+    else
+        rm -f /var/lib/mender/upgrade_available
+    fi
 fi
 exit 0
diff --git a/...er-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender-client_%.bbappend b/...er-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender-client_%.bbappend
@@ -1 +1,3 @@
 require mender-tegra.inc
+
+RDEPENDS:${PN} += "${EXTRADEPS}"
diff --git a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender-tegra.inc b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender-tegra.inc
@@ -1,5 +1,4 @@
 EXTRADEPS:tegra = "tegra-bup-payload tegra-uefi-capsules libubootenv-fake mender-update-verifier"
-RDEPENDS:${PN} += "${EXTRADEPS}"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:remove:mender-persist-systemd-machine-id = " \

diff --git a/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender_%.bbappend b/meta-mender-tegra/meta-mender-tegra-jetpack5/recipes-mender/mender-client/mender_%.bbappend
@@ -1,5 +1,7 @@
 require mender-tegra.inc
 
+RDEPENDS:mender-update += "${EXTRADEPS}"
+
 FILES:mender-update:append:mender-persist-systemd-machine-id = " \
     ${bindir}/efi_systemd_machine_id.sh \
 "
diff --git a/...tegra-jetpack5/recipes-mender/mender-update-verifier/files/mender-update-verifier.service b/...tegra-jetpack5/recipes-mender/mender-update-verifier/files/mender-update-verifier.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mender update verifier
 Requires=nv_update_verifier.service
-Before=mender-client.service
+Before=mender-client.service mender-updated.service nv_update_verifier.service
 
 [Service]
 Type=oneshot