From de9d4abf44048da414b26bb5492f90469ce4b3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sat, 23 Oct 2021 23:36:25 +0200 Subject: [PATCH] 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 release. The compat_version should be bumped manually on release, so we stay compatible with OpenWrt releases. Signed-off-by: Fabian Bläse Reviewed by: Robert Langhammer --- ...020-mt7621-retain-old-compat_version.patch | 19 +++++++++++++++++++ src/packages/fff/fff-support/Makefile | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 build_patches/openwrt/0020-mt7621-retain-old-compat_version.patch diff --git a/build_patches/openwrt/0020-mt7621-retain-old-compat_version.patch b/build_patches/openwrt/0020-mt7621-retain-old-compat_version.patch new file mode 100644 index 00000000..abec6189 --- /dev/null +++ b/build_patches/openwrt/0020-mt7621-retain-old-compat_version.patch @@ -0,0 +1,19 @@ +From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= +Date: Sat, 23 Oct 2021 23:34:07 +0200 +Subject: [PATCH] mt7621: retain old compat_version + +diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk +index a3bc14d59d..99887e8192 100644 +--- a/target/linux/ramips/image/mt7621.mk ++++ b/target/linux/ramips/image/mt7621.mk +@@ -91,8 +91,7 @@ define Build/zytrx-header + endef + + define Device/dsa-migration +- DEVICE_COMPAT_VERSION := 1.1 +- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA ++ DEVICE_COMPAT_VERSION := 1.0 + endef + + define Device/adslr_g7 + diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile index 508a2097..f309477a 100644 --- a/src/packages/fff/fff-support/Makefile +++ b/src/packages/fff/fff-support/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-support -PKG_RELEASE:=8 +PKG_RELEASE:=9 include $(INCLUDE_DIR)/package.mk