diff mbox series

mvebu: cortexa9: remove wifi migration script

Message ID 20210807135817.1075035-1-dqfext@gmail.com
State Rejected
Delegated to: Petr Štetiar
Headers show
Series mvebu: cortexa9: remove wifi migration script | expand

Commit Message

Qingfang Deng Aug. 7, 2021, 1:58 p.m. UTC 
As we can't upgrade to 21.02 while keeping config anyway, remove the
migration script.

Signed-off-by: DENG Qingfang <dqfext@gmail.com>
---
 .../ieee80211/00-wifi-config-migrate          | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate

Comments

Arınç ÜNAL Aug. 10, 2021, 2:53 p.m. UTC | #1 
On Sat, Aug 7, 2021 at 5:03 PM DENG Qingfang <dqfext@gmail.com> wrote:
>
> As we can't upgrade to 21.02 while keeping config anyway, remove the
> migration script.

Hey Deng. As of now, it's impossible to upgrade to 21.02 with older
configurations for targets that switched from swconfig to DSA.
There's a lack of a migration script from swconfig to DSA. However,
I'm actually working on developing one. After that, we will be able to
upgrade while keeping the configuration from previous OpenWrt
releases.

Therefore, this script will still have a use. I think it should stay.

Cheers.
Arınç
diff mbox series

Patch

diff --git a/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate b/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
deleted file mode 100644
index a8173b3117..0000000000
--- a/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
+++ /dev/null
@@ -1,41 +0,0 @@ 
-#!/bin/sh
-
-# The pcie-controller device was renamed to pcie in Linux kernel 4.14
-# commit 28fbb9c539e2 ("ARM: dts: marvell: fix PCI bus dtc warnings").
-# This script migrates the path in the UCI configuration from the old
-# name to the new name and also back, when am upgrade or downgrade is
-# done. It checks if the name exists before changing the configuration.
-# This has to be done before the 10-wifi-detect script from mac80211 is
-# executed because this would add the devices again under the new path
-# name.
-
-. /lib/functions.sh
-
-PATH_CHANGED=0
-
-rename_wifi_path() {
-	local path_old=$(uci get wireless.${1}.path)
-	local path_new=$(echo ${path_old} | sed "${2}")
-
-	if [ -e "/sys/devices/platform/${path_new}" ] && [ ${path_old} != ${path_new} ]
-	then 
-		uci set wireless.${1}.path=${path_new}
-		PATH_CHANGED=1
-	fi
-}
-
-rename_wifi_path_list() {
-	# migration from kernel 4.9 to 4.14
-	rename_wifi_path $1 "s/soc:pcie-controller/soc:pcie/"
-	# migration from kernel 4.14 to 4.9
-	rename_wifi_path $1 "s/soc:pcie/soc:pcie-controller/"
-}
-
-[ "${ACTION}" = "add" ] && {
-	[ ! -e /etc/config/wireless ] && return
-
-	config_load wireless
-	config_foreach rename_wifi_path_list wifi-device
-
-	[ "$PATH_CHANGED" = "1" ] && uci commit wireless
-}