From 135bbc423b3a1d222e091ee011b58132a27261c3 Mon Sep 17 00:00:00 2001
From: Chen Jiali <chenjiali@radxa.com>
Date: Tue, 18 Feb 2025 09:50:08 +0800
Subject: [PATCH] radxa-aic8800: use systemd.link instead of udev rule

And move naming_wireless_interface to radxa-aic8800.sh

To avoid unexpected errors caused by ID_NET_SLOT being empty when using lower version udev
---
 config/boards/rock-5c.conf  | 9 ---------
 extensions/radxa-aic8800.sh | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/boards/rock-5c.conf b/config/boards/rock-5c.conf
index 0d3a11e54d..ac429f6023 100644
--- a/config/boards/rock-5c.conf
+++ b/config/boards/rock-5c.conf
@@ -24,12 +24,3 @@ function post_family_tweaks__rock5c_naming_audios() {
 
 	return 0
 }
-
-function post_family_tweaks__rock5c_naming_wireless_interface() {
-	display_alert "$BOARD" "Renaming rock5c wifi" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="88:00:*", NAME="$ENV{ID_NET_SLOT}"' > $SDCARD/etc/udev/rules.d/99-radxa-aic8800.rules
-
-	return 0
-}
diff --git a/extensions/radxa-aic8800.sh b/extensions/radxa-aic8800.sh
index 506a78289f..ec52c3424b 100644
--- a/extensions/radxa-aic8800.sh
+++ b/extensions/radxa-aic8800.sh
@@ -51,4 +51,13 @@ function post_install_kernel_debs__install_aic8800_dkms_package() {
 	declare -ag if_error_find_files_sdcard=("/var/lib/dkms/aic8800*/*/build/*.log")
 	use_clean_environment="yes" chroot_sdcard_apt_get_install "/tmp/${aic8800_dkms_file_name} /tmp/aic8800-firmware_${latest_version}_all.deb"
 	use_clean_environment="yes" chroot_sdcard "rm -f /tmp/aic8800*.deb"
+	use_clean_environment="yes" chroot_sdcard "mkdir -p /usr/lib/systemd/network/"
+	use_clean_environment="yes" chroot_sdcard 'cat <<- EOF > /usr/lib/systemd/network/50-radxa-aic8800.link
+		[Match]
+		OriginalName=wlan*
+		Driver=usb
+
+		[Link]
+		NamePolicy=kernel
+	EOF'
 }