From f39e62fdb1689766b91dc201167d82c68c80a3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 19 May 2026 13:30:28 +0200 Subject: [PATCH] feature-wifi: Only install files in romfs if enabled Move from board romfs directory, to inside feature-wifi --- .../feature-wifi}/60-rename-wifi-phy.rules | 0 .../70-remove-virtual-wifi-interfaces.rules | 0 package/feature-wifi/feature-wifi.mk | 9 +++++++++ .../etc/modprobe.d => package/feature-wifi}/mt7915e.conf | 0 4 files changed, 9 insertions(+) rename {board/common/rootfs/etc/udev/rules.d => package/feature-wifi}/60-rename-wifi-phy.rules (100%) rename {board/common/rootfs/etc/udev/rules.d => package/feature-wifi}/70-remove-virtual-wifi-interfaces.rules (100%) rename {board/aarch64/rootfs/etc/modprobe.d => package/feature-wifi}/mt7915e.conf (100%) diff --git a/board/common/rootfs/etc/udev/rules.d/60-rename-wifi-phy.rules b/package/feature-wifi/60-rename-wifi-phy.rules similarity index 100% rename from board/common/rootfs/etc/udev/rules.d/60-rename-wifi-phy.rules rename to package/feature-wifi/60-rename-wifi-phy.rules diff --git a/board/common/rootfs/etc/udev/rules.d/70-remove-virtual-wifi-interfaces.rules b/package/feature-wifi/70-remove-virtual-wifi-interfaces.rules similarity index 100% rename from board/common/rootfs/etc/udev/rules.d/70-remove-virtual-wifi-interfaces.rules rename to package/feature-wifi/70-remove-virtual-wifi-interfaces.rules diff --git a/package/feature-wifi/feature-wifi.mk b/package/feature-wifi/feature-wifi.mk index 84a977b4..47059efe 100644 --- a/package/feature-wifi/feature-wifi.mk +++ b/package/feature-wifi/feature-wifi.mk @@ -68,4 +68,13 @@ define FEATURE_WIFI_LINUX_CONFIG_FIXUPS ) endef +define FEATURE_WIFI_INSTALL_IN_ROMFS + mkdir -p $(TARGET_DIR)/etc/modprobe.d $(TARGET_DIR)/etc/udev/rules.d + cp $(FEATURE_WIFI_PKGDIR)/mt7915e.conf $(TARGET_DIR)/etc/modprobe.d/mt7915e.conf + cp $(FEATURE_WIFI_PKGDIR)/60-rename-wifi-phy.rules $(TARGET_DIR)/etc/udev/rules.d/60-rename-wifi-phy.rules + cp $(FEATURE_WIFI_PKGDIR)/70-remove-virtual-wifi-interfaces.rules $(TARGET_DIR)/etc/udev/rules.d/70-remove-virtual-wifi-interfaces.rules +endef +FEATURE_WIFI_POST_INSTALL_TARGET_HOOKS += FEATURE_WIFI_INSTALL_IN_ROMFS + + $(eval $(generic-package)) diff --git a/board/aarch64/rootfs/etc/modprobe.d/mt7915e.conf b/package/feature-wifi/mt7915e.conf similarity index 100% rename from board/aarch64/rootfs/etc/modprobe.d/mt7915e.conf rename to package/feature-wifi/mt7915e.conf