From 29f6da43403c5131d0035de0bfc4107eee17953b Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Mon, 4 Dec 2023 03:09:28 -0800 Subject: [PATCH] kernel: include built-in module list Add modules.builtin to the kernel package for improved handling of loadable and builtin modules. As with other distros, this allows 'modprobe ' to consistently return success for both loaded/built-in modules, a useful feature for presence-testing. Given OpenWrt's few built-in modules, this change and related kmodloader support add ~1 KB to the compressed image size. Using sch_fq_codel (builtin) and sch_cake (loadable) for example: root@OpenWrt:/# modprobe sch_fq_codel && echo SUCCESS || echo FAIL SUCCESS root@OpenWrt:/# modprobe sch_cake && echo SUCCESS || echo FAIL SUCCESS root@OpenWrt:/# rmmod sch_fq_codel module is builtin Signed-off-by: Tony Ambardar --- package/kernel/linux/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile index c88b5c1b31..b198882979 100644 --- a/package/kernel/linux/Makefile +++ b/package/kernel/linux/Makefile @@ -58,7 +58,9 @@ define Package/kernel endef define Package/kernel/install - # nothing to do + $(INSTALL_DIR) $(1)/$(MODULES_SUBDIR) + $(INSTALL_DATA) $(LINUX_DIR)/modules.builtin $(1)/$(MODULES_SUBDIR) + $(SED) 's,.*/,,' $(1)/$(MODULES_SUBDIR)/modules.builtin endef define Package/kernel/extra_provides