From 38f6d5d217ca0c42f7f42b08f835a8a9cee71ad7 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 8 Aug 2020 21:33:25 +0200 Subject: [PATCH] treewide: revert sysupgrade adjustments for early DSA-adopters The uci-default mechanism to update the compat-version was only meant for early DSA-adopters, which should have updated by now. Remove this workaround again in order to prevent the intended experiences for all the other people. This reverts: a9703db72030 ("mvebu: fix sysupgrade experience for early DSA-adopters") 86c89bf5e8f5 ("kirkwood: fix sysupgrade experience for early DSA-adopters") Partially reverted: 1eac573b5304 ("ramips: mt7621: implement compatibility version for DSA migration") Signed-off-by: Adrian Schmutzler --- .../etc/uci-defaults/05_fix-compat-version | 16 -------------- .../etc/uci-defaults/05_fix-compat-version | 21 ------------------- .../etc/uci-defaults/05_fix-compat-version | 8 ------- 3 files changed, 45 deletions(-) delete mode 100644 target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version delete mode 100644 target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version delete mode 100644 target/linux/ramips/mt7621/base-files/etc/uci-defaults/05_fix-compat-version diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version deleted file mode 100644 index d7f8488e88..0000000000 --- a/target/linux/kirkwood/base-files/etc/uci-defaults/05_fix-compat-version +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (C) 2020 OpenWrt.org -# - -. /lib/functions.sh - -case "$(board_name)" in - linksys,e4200-v2|\ - linksys,ea3500|\ - linksys,ea4500) - uci set system.@system[0].compat_version="1.1" - uci commit system - ;; -esac - -exit 0 diff --git a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version deleted file mode 100644 index 5965fdc2f5..0000000000 --- a/target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/05_fix-compat-version +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2020 OpenWrt.org -# - -. /lib/functions.sh - -case "$(board_name)" in - linksys,wrt1200ac|\ - linksys,wrt1900ac-v1|\ - linksys,wrt1900ac-v2|\ - linksys,wrt1900acs|\ - linksys,wrt3200acm|\ - linksys,wrt32x|\ - solidrun,clearfog-base-a1|\ - solidrun,clearfog-pro-a1) - uci set system.@system[0].compat_version="1.1" - uci commit system - ;; -esac - -exit 0 diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/05_fix-compat-version deleted file mode 100644 index 09cce180e4..0000000000 --- a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/05_fix-compat-version +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2020 OpenWrt.org -# - -uci set system.@system[0].compat_version="1.1" -uci commit system - -exit 0