dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: only run kernel module list through version filter where version specific items are present - cuts package/kernel/linux/compile time in half

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45131
v19.07.3_mercusys_ac12_duma
Felix Fietkau 9 years ago
parent d2030482b3
commit ed1e783aa1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File

12
include/kernel.mk
Unescape Escape View File

@ -88,7 +88,7 @@ define ModuleAutoLoad
mods="$$$$$$$$1"; \ mods="$$$$$$$$1"; \
boot="$$$$$$$$2"; \ boot="$$$$$$$$2"; \
shift 2; \ shift 2; \
for mod in $$$$$$$$($(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $$$$$$$$mods); do \ for mod in $$$$$$$$mods; do \
mkdir -p $(2)/etc/modules.d; \ mkdir -p $(2)/etc/modules.d; \
echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \ echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
done; \ done; \
@ -105,7 +105,7 @@ define ModuleAutoLoad
mods="$$$$$$$$2"; \ mods="$$$$$$$$2"; \
boot="$$$$$$$$3"; \ boot="$$$$$$$$3"; \
shift 3; \ shift 3; \
for mod in $$$$$$$$($(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $$$$$$$$mods); do \ for mod in $$$$$$$$mods; do \
mkdir -p $(2)/etc/modules.d; \ mkdir -p $(2)/etc/modules.d; \
echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
done; \ done; \
@ -174,7 +174,7 @@ $(call KernelPackage/$(1)/config)
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
ifneq ($(if $(SDK),$(filter-out $(LINUX_DIR)/%.ko,$(FILES)),$(strip $(FILES))),) ifneq ($(if $(SDK),$(filter-out $(LINUX_DIR)/%.ko,$(FILES)),$(strip $(FILES))),)
define Package/kmod-$(1)/install define Package/kmod-$(1)/install
@for mod in $$$$$$$$($(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $$(FILES)); do \ @for mod in $$(call version_filter,$$(FILES)); do \
if [ -e $$$$$$$$mod ]; then \ if [ -e $$$$$$$$mod ]; then \
mkdir -p $$(1)/$(MODULES_SUBDIR) ; \ mkdir -p $$(1)/$(MODULES_SUBDIR) ; \
$(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \ $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \
@ -209,12 +209,14 @@ $(call KernelPackage/$(1)/config)
$$(IPKG_kmod-$(1)): $$(wildcard $$(FILES)) $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
endef endef
version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1))
define AutoLoad define AutoLoad
add_module "$(1)" "$(2)" "$(3)"; add_module "$(1)" "$(call version_filter,$(2))" "$(3)";
endef endef
define AutoProbe define AutoProbe
probe_module "$(1)" "$(2)"; probe_module "$(call version_filter,$(1))" "$(2)";
endef endef
version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0) version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0)

Write Preview
Loading…
Cancel
Save