ipq40xx: retain old compat_version for sysupgrade compatibility

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.
WIP: OpenWrt: bump to v23.05
2023-08-08 21:09:13 +02:00 · 2023-08-08 21:04:47 +02:00
2 changed files with 29 additions and 1 deletions
--- a/build_patches/openwrt/0050-ipq40xx-restore-label-mac-alias.patch
+++ b/build_patches/openwrt/0050-ipq40xx-restore-label-mac-alias.patch
@ -1,6 +1,17 @@
 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
 Date: Sun, 6 Aug 2023 19:57:16 +0200
-Subject: [PATCH] ipq40xx: restore label mac alias
+Subject: [PATCH 1/2] ipq40xx: re-add label MAC address for FritzBox 4040
+
+The MAC address of the GMAC is contained inside the CWMP-Account
+number on the label.
+
+The label MAC address alias was defined previously, but it has been
+removed with the switch to IPQESS / DSA.
+
+Restore the label MAC address alias.
+
+Fixes: 27b441cbaf42 ("ipq40xx: drop ESSEDMA + AR40xx DTS nodes")
+Signed-off-by: Fabian Bläse <fabian@blaese.de>

 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
 index e448206c36..ec1112ee2b 100644
--- a/build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch
+++ b/build_patches/openwrt/0051-ipq40xx-retain-old-compat_version.patch
@ -0,0 +1,17 @@
+From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
+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