[openwrt/openwrt] qoriq: set compat_version in board.d

LEDE Commits lede-commits at lists.infradead.org
Sat Dec 2 07:16:23 PST 2023


stintel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c342bdca878837ba02ed09eba7fbe3175e3a3b87

commit c342bdca878837ba02ed09eba7fbe3175e3a3b87
Author: Russell Senior <russell at personaltelco.net>
AuthorDate: Fri Dec 1 13:48:55 2023 -0800

    qoriq: set compat_version in board.d
    
    Currently, sysupgrade without the -n option complains:
    
      # sysupgrade -v tmp/openwrt-qoriq-generic-watchguard_firebox-m300-squashfs-sysupgrade.img.gz
      upgrade: The device is supported, but the config is incompatible to the new image (1.0->1.1). Please upgrade without keeping config (sysupgrade -n).
      upgrade: Kernel switched to FIT uImage. Update U-Boot environment.
      upgrade: Reading partition table from bootdisk...
      upgrade: Extract boot sector from the image
      upgrade: Reading partition table from image...
      Image check failed.
    
    So, add the missing 05_compat-version to /etc/board.d/ to allow
    sysupgrade to save config without using -f.
    
    Fixes: c4b499bc03ab ("qoriq: use FIT uImage for Firebox M300 kernel")
    Signed-off-by: Russell Senior <russell at personaltelco.net>
    [drop invalid copyright header, add SPDX license header, shorten commit
    subject, add fixes tag]
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
---
 .../linux/qoriq/base-files/etc/board.d/05_compat-version | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/target/linux/qoriq/base-files/etc/board.d/05_compat-version b/target/linux/qoriq/base-files/etc/board.d/05_compat-version
new file mode 100644
index 0000000000..2036fbcc95
--- /dev/null
+++ b/target/linux/qoriq/base-files/etc/board.d/05_compat-version
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. /lib/functions.sh
+. /lib/functions/uci-defaults.sh
+
+board_config_update
+
+case "$(board_name)" in
+	watchguard,firebox-m300)
+		ucidef_set_compat_version "1.1"
+		;;
+esac
+
+board_config_flush
+
+exit 0




More information about the lede-commits mailing list