diff options
| author | Nicolas Thill <nico@openwrt.org> | 2011-10-28 13:10:43 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2011-10-28 13:10:43 +0000 |
| commit | b5af64c5294f4bc08fef0e3951ca8d8f5f1ac5d6 (patch) | |
| tree | 732bfde36f449d04fc69c2b4437d8b016f05cd81 /include/kernel.mk | |
| parent | b58d54f621fd0bf0c6fbee8a657def8be96aec9e (diff) | |
| download | master-31e0f0ae-b5af64c5294f4bc08fef0e3951ca8d8f5f1ac5d6.tar.gz master-31e0f0ae-b5af64c5294f4bc08fef0e3951ca8d8f5f1ac5d6.tar.bz2 master-31e0f0ae-b5af64c5294f4bc08fef0e3951ca8d8f5f1ac5d6.zip | |
kernel: build kmod even for modules built-in
SVN-Revision: 28649
Diffstat (limited to 'include/kernel.mk')
| -rw-r--r-- | include/kernel.mk | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 467172e932..9e94dce3b9 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -82,16 +82,18 @@ define ModuleAutoLoad mods="$$$$$$$$2"; \ boot="$$$$$$$$3"; \ shift 3; \ - mkdir -p $(2)/etc/modules.d; \ - ( \ - [ "$$$$$$$$boot" = "1" ] && { \ - echo '# May be required for rootfs' ; \ - } ; \ - for mod in $$$$$$$$mods; do \ - echo "$$$$$$$$mod"; \ - done \ - ) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ - modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ + for mod in $$$$$$$$mods; do \ + if [ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ]; then \ + mkdir -p $(2)/etc/modules.d; \ + echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ + fi; \ + done; \ + if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \ + if [ "$$$$$$$$boot" = "1" ]; then \ + echo '# May be required for rootfs' >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ + fi; \ + modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ + fi; \ }; \ $(3) \ if [ -n "$$$$$$$$modules" ]; then \ @@ -147,11 +149,17 @@ $(call KernelPackage/$(1)/config) $(call KernelPackage/depends) - ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(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 ($(strip $(FILES)),) define Package/kmod-$(1)/install - mkdir -p $$(1)/$(MODULES_SUBDIR) - $(CP) -L $$(FILES) $$(1)/$(MODULES_SUBDIR)/ + @for mod in $$(FILES); do \ + if [ -e $$$$$$$$mod ]; then \ + mkdir -p $$(1)/$(MODULES_SUBDIR) ; \ + $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \ + else \ + echo "WARNING: module '$$$$$$$$mod' does not exist, is it built-in?" ; \ + fi; \ + done; $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) $(call KernelPackage/$(1)/install,$$(1)) endef |