From ecc590cbaa438c93fe4349a8a8ed4357a8337c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Wed, 24 Jan 2024 16:55:33 +0100 Subject: [PATCH] mpc85xx: retain old compat_version for sysupgrade compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenWrt images contain a compat_version, which is used to block upgrades to newer versions with incompatible configuration, if the configuration cannot be migrated. As we maintain our own configuration and all OpenWrt configuration files are dropped on an upgrade, this upgrade block is not required. To simplify the upgrade process, retain the old compat_version for the next sysupgrade release. The compat_version will then be bumped automatically by the `05_compat-version` board.d script. Signed-off-by: Fabian Bläse --- ...0052-mpc85xx-retain-old-compat_version.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 build_patches/openwrt/0052-mpc85xx-retain-old-compat_version.patch diff --git a/build_patches/openwrt/0052-mpc85xx-retain-old-compat_version.patch b/build_patches/openwrt/0052-mpc85xx-retain-old-compat_version.patch new file mode 100644 index 00000000..29874a4c --- /dev/null +++ b/build_patches/openwrt/0052-mpc85xx-retain-old-compat_version.patch @@ -0,0 +1,17 @@ +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= +Date: Wed, 24 Jan 2024 16:50:12 +0200 +Subject: [PATCH] mpc85xx: retain old compat_version + +diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk +index c0de19f6c6..5aa580300f 100644 +--- a/target/linux/mpc85xx/image/p1010.mk ++++ b/target/linux/mpc85xx/image/p1010.mk +@@ -51,8 +51,6 @@ define Device/tplink_tl-wdr4900-v1 + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := TL-WDR4900 + DEVICE_VARIANT := v1 +- DEVICE_COMPAT_VERSION := 1.1 +- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA + TPLINK_HEADER_VERSION := 1 + TPLINK_HWID := 0x49000001 + TPLINK_HWREV := 1