aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-07-21 18:53:07 +0200
committerJo-Philipp Wich <jo@mein.io>2017-07-21 18:55:19 +0200
commit3e26340a2e5066770c1fd664cdf819899b0f26d7 (patch)
tree6fb4ec5ff2ce3a5681aa0dc51a421b1375847a8d
parente3d135ab56dae3fbb9bbc04a7a18f766c2d70749 (diff)
downloadupstream-3e26340a2e5066770c1fd664cdf819899b0f26d7.tar.gz
upstream-3e26340a2e5066770c1fd664cdf819899b0f26d7.tar.bz2
upstream-3e26340a2e5066770c1fd664cdf819899b0f26d7.zip
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>
-rw-r--r--include/kernel.mk2
1 files changed, 0 insertions, 2 deletions
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; \