From 61b1bebbd2256084c25e6ea65c6e5e2777f911c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Tue, 8 Aug 2023 21:00:59 +0200 Subject: [PATCH] ipq40xx: 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 --- ...0051-ipq40xx-retain-old-compat_version.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch diff --git a/build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch b/build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch new file mode 100644 index 0000000..a0237b9 --- /dev/null +++ b/build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch @@ -0,0 +1,17 @@ +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= +Date: Tue, 8 Aug 2023 20:59:16 +0200 +Subject: [PATCH] ipq40xx: retain old compat_version + +diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile +index 2ba4c779a0..5851b29875 100644 +--- a/target/linux/ipq40xx/image/Makefile ++++ b/target/linux/ipq40xx/image/Makefile +@@ -10,8 +10,6 @@ define Device/Default + IMAGES := sysupgrade.bin + IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata + IMAGE/sysupgrade.bin/squashfs := +- DEVICE_COMPAT_VERSION := 1.1 +- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA + endef + + include $(SUBTARGET).mk