Skip to content
Snippets Groups Projects
Commit 735de53b authored by Adrian Schmutzler's avatar Adrian Schmutzler
Browse files

base-files: add support for compat_version on device


We regularly encounter the situation that devices are subject to
changes that will make them incompatible to previous versions.
Removing SUPPORTED_DEVICES will not really be helpful in most of these
cases, as this only helps after a rename.

To solve this situation, this patchset introduces a compatibility
version for devices. To complement the DEVICE_COMPAT_VERSION set
for the image to be flashed, this implements a compat_version on
the device, so it will have something to compare with the image.

The only viable way to achieve this seems to be via board.d files,
i.e. this is technically adding a compat version for the device's
config.

Like for the network setup, this will set up a command
ucidef_set_compat_version to set the compat_version in board.d.
This will then add a string to /etc/board.json, which will be
translated into uci system config by bin/config_generate.
By this, the compat_version, being a version of the config, will
also be exposed to the user.

As with DEVICE_COMPAT_VERSION, missing uci entry will be assumed
as compat_version "1.0", so we only need to add this if a device
needs to be bumped, e.g.

   ucidef_set_compat_version "1.1"

Signed-off-by: default avatarAdrian Schmutzler <freifunk@adrianschmutzler.de>
parent 6867d86e
Branches
No related tags found
No related merge requests found
...@@ -264,6 +264,13 @@ generate_static_system() { ...@@ -264,6 +264,13 @@ generate_static_system() {
uci -q set "system.@system[-1].hostname=$hostname" uci -q set "system.@system[-1].hostname=$hostname"
fi fi
local compat_version
if json_get_var compat_version compat_version; then
uci -q set "system.@system[-1].compat_version=$compat_version"
else
uci -q set "system.@system[-1].compat_version=1.0"
fi
if json_is_a ntpserver array; then if json_is_a ntpserver array; then
local keys key local keys key
json_get_keys keys ntpserver json_get_keys keys ntpserver
......
...@@ -68,6 +68,12 @@ ucidef_set_model_name() { ...@@ -68,6 +68,12 @@ ucidef_set_model_name() {
json_select .. json_select ..
} }
ucidef_set_compat_version() {
json_select_object system
json_add_string compat_version "${1:-1.0}"
json_select ..
}
ucidef_set_interface_lan() { ucidef_set_interface_lan() {
ucidef_set_interface "lan" ifname "$1" protocol "${2:-static}" ucidef_set_interface "lan" ifname "$1" protocol "${2:-static}"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment