From: Shiji Yang <yangshiji66@outlook.com>
Date: Tue, 17 Jun 2025 23:39:57 +0000 (+0800)
Subject: treewide: simplify kernel version number comparisons
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19172%2Fhead;p=thirdparty%2Fopenwrt.git

treewide: simplify kernel version number comparisons

Directly call the function "get_linux_version()" to get the integer
kernel version number.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19172
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/armsr/base-files/etc/board.d/03_gpio_switches b/target/linux/armsr/base-files/etc/board.d/03_gpio_switches
index 72f310277ae..10c24a42014 100644
--- a/target/linux/armsr/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/armsr/base-files/etc/board.d/03_gpio_switches
@@ -1,18 +1,16 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+. /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
 
-KERNEL_MAJOR=$(uname -r | awk -F '.' '{print $1}')
-KERNEL_MINOR=$(uname -r | awk -F '.' '{print $2}')
-
 board_config_update
 
 board=$(board_name)
 
 case "$board" in
 traverse,ten64)
-	if [ "${KERNEL_MAJOR}" -ge "6" ] && [ "${KERNEL_MINOR}" -ge "6" ]; then
+	if [ "$(get_linux_version)" -ge "606000" ]; then
 		I2C_GPIO_BASE=640
 	else
 		I2C_GPIO_BASE=368
diff --git a/target/linux/armsr/base-files/etc/uci-defaults/05-migrate-ten64-gpio b/target/linux/armsr/base-files/etc/uci-defaults/05-migrate-ten64-gpio
index dc8648e5705..649b14061c7 100644
--- a/target/linux/armsr/base-files/etc/uci-defaults/05-migrate-ten64-gpio
+++ b/target/linux/armsr/base-files/etc/uci-defaults/05-migrate-ten64-gpio
@@ -6,6 +6,7 @@
 # See https://lists.openwrt.org/pipermail/openwrt-devel/2024-March/042448.html
 
 . /lib/functions.sh
+. /lib/functions/system.sh
 
 ten64_update_gpioswitch_num() {
 	local section="$1"
@@ -26,8 +27,7 @@ if [ "${board}" != "traverse,ten64" ]; then
 	exit 0
 fi
 
-KERNEL_MINOR=$(uname -r | awk -F '.' '{print $2}')
-if [ "${KERNEL_MINOR}" -lt "6" ]; then
+if [ "$(get_linux_version)" -lt "60600" ]; then
 	exit 0
 fi
 
diff --git a/target/linux/bmips/bcm63268/base-files/etc/board.d/03_gpio_switches b/target/linux/bmips/bcm63268/base-files/etc/board.d/03_gpio_switches
index 2e754ad498c..97a25e15dc8 100644
--- a/target/linux/bmips/bcm63268/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/bmips/bcm63268/base-files/etc/board.d/03_gpio_switches
@@ -1,13 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+. /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
 
-KERNEL_MAJOR=$(uname -r | awk -F '.' '{print $1}')
-KERNEL_MINOR=$(uname -r | awk -F '.' '{print $2}')
-
 board_config_update
 
-if [ "${KERNEL_MAJOR}" -ge "6" ] && [ "${KERNEL_MINOR}" -ge "12" ]; then
+if [ "$(get_linux_version)" -ge "612000" ]; then
 	GPIO_BASE=512
 else
 	GPIO_BASE=460
diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate
index aa0069410a2..9e8879905a7 100644
--- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/05-wifi-migrate
@@ -5,14 +5,7 @@
 [ "${ACTION}" = "add" ] || return
 
 . /lib/functions.sh
-
-check_kernel()
-{
-	local kernel_current=$(uname -r)
-	if [ ${kernel_current//./} -lt "6600" ]; then
-	  return 1
-	fi
-}
+. /lib/functions/system.sh
 
 do_migrate_radio()
 {
@@ -40,7 +33,7 @@ check_path()
 	# Checks if kernel version is less than 6.6.0, if it is and the path is using the new format,
 	# then path should be migrated to the old format. This would allow users on platforms with two partitions,
 	# to test 6.1 and 6.6.
-	check_kernel || to=${path/soc@0\//soc\/}
+	[ "$(get_linux_version)" -lt "606000" ] && to=${path/soc@0\//soc\/}
 
 	[ "$path" = "$to" ] || do_migrate_radio "$config" "$path" "$to"
 }