aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-04-10 09:03:52 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-04-12 05:47:10 +0200
commitd3756a9a134bdca2a6af0d6e0772778cc1bb42e1 (patch)
treec2072e927d91e660b6c61e94fe7399f29ac7b179 /include
parent85282ae69c7b53177bc49e8e879d6e53c90241fe (diff)
downloadupstream-d3756a9a134bdca2a6af0d6e0772778cc1bb42e1.tar.gz
upstream-d3756a9a134bdca2a6af0d6e0772778cc1bb42e1.tar.bz2
upstream-d3756a9a134bdca2a6af0d6e0772778cc1bb42e1.zip
include/kernel.mk: build kmod packages with empty FILES
kmod packages without FILES did not have an install step defined, leading to no package being built. This affected netfilter/iptables packages, which filter out builtin modules from FILES. Not building a package that it is selected in .config is problematic, as the generated empty package may be necessary to satisfy dependencies. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'include')
-rw-r--r--include/kernel.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 1b6006a62d..c169550f48 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -225,8 +225,7 @@ $(call KernelPackage/$(1)/config)
$(call KernelPackage/hooks)
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
- ifneq ($(strip $(FILES)),)
- define Package/kmod-$(1)/install
+ define Package/kmod-$(1)/install
@for mod in $$(call version_filter,$$(FILES)); do \
if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \
echo "NOTICE: module '$$$$$$$$mod' is built-in."; \
@@ -240,8 +239,7 @@ $(call KernelPackage/$(1)/config)
done;
$(call ModuleAutoLoad,$(1),$$(1),$(filter-out 0-,$(word 1,$(AUTOLOAD))-),$(filter-out 0,$(word 2,$(AUTOLOAD))),$(wordlist 3,99,$(AUTOLOAD)))
$(call KernelPackage/$(1)/install,$$(1))
- endef
- endif
+ endef
$(if $(CONFIG_PACKAGE_kmod-$(1)),
else
compile: $(1)-disabled