From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 21 Jul 2017 16:53:07 +0000 (+0200)
Subject: Revert "kernel: do not try to probe builtin modules on empty kmod package install"
X-Git-Tag: v18.06.0-rc1~2482
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e26340a2e5066770c1fd664cdf819899b0f26d7;p=oweals%2Fopenwrt.git

Revert "kernel: do not try to probe builtin modules on empty kmod package install"

This change currently causes some issues with loading out of tree kernel modules
so revert that commit for now.

Reverts commit 34c01e68b5d6b06ce3794ef0e2b06e81ec3ce8ca. Fixes FS#919.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/include/kernel.mk b/include/kernel.mk
index d780ef0ce2..7674f0dadc 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -136,7 +136,6 @@ define ModuleAutoLoad
 		local mod; \
 		shift 2; \
 		for mod in $$$$$$$$mods; do \
-			[ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ] || continue; \
 			mkdir -p $(2)/etc/modules.d; \
 			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
 		done; \
@@ -155,7 +154,6 @@ define ModuleAutoLoad
 		local mod; \
 		shift 3; \
 		for mod in $$$$$$$$mods; do \
-			[ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ] || continue; \
 			mkdir -p $(2)/etc/modules.d; \
 			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
 		done; \