From 981c5e44bb171d78056bde0359d23a5198def9b8 Mon Sep 17 00:00:00 2001 From: David Escalona Date: Thu, 10 Aug 2023 16:26:31 +0200 Subject: [PATCH] meta-digi-dey: core: add 'bootcount' to DEY core package group to reset bootcount on boot While on it, remove the block of the 'dualboot' script that was taking care of this action. https://onedigi.atlassian.net/browse/DEL-8506 Signed-off-by: David Escalona --- .../packagegroups/packagegroup-dey-core.bb | 3 ++- .../recipes-digi/dualboot/dualboot/dualboot-init | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index 4692b509c..d9d8f3482 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2022 Digi International. +# Copyright (C) 2012-2023 Digi International. # SUMMARY = "Core packagegroup for DEY image" @@ -36,6 +36,7 @@ SYSVINIT_SCRIPTS = " \ RDEPENDS:${PN} = "\ base-files \ base-passwd \ + bootcount \ connectcore-demo-example \ ${CLOUDCONNECTOR_PKG} \ dualboot \ diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init b/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init index 63dc75ba0..e30cbc617 100644 --- a/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init +++ b/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init @@ -28,16 +28,6 @@ dualboot_init () { fw_setenv active_system "${MTD_BOOT_PART}" fi fi - - ISUPGRADING="$(fw_printenv -n upgrade_available 2>/dev/null)" - - if [ "$ISUPGRADING" = "1" ]; then - BOOTCOUNT="$(fw_printenv -n bootcount 2>/dev/null)" - if [ "${BOOTCOUNT}" -lt 3 ]; then - fw_setenv upgrade_available - fw_setenv bootcount 0 - fi - fi } case "$1" in