diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-13 11:45:09 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-13 11:45:09 +0000 |
| commit | 0620a234d1c5cfed0f4928fdb2b2fc40d7c5c74b (patch) | |
| tree | 9a9a8c7691a9a782be2ef3243b5a697daaea92bc | |
| parent | 3095cc80909037f4344bfc12275a028da6383cf6 (diff) | |
include/kernel.mk: don't check for modules.builtin on 2.6.32-
modules.builtin is only available in 2.6.33 and later, so fall back to
assuming it's built-in for older kernels.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29018 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 1591c3613..1af072d6b 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -157,11 +157,15 @@ $(call KernelPackage/$(1)/config) if [ -e $$$$$$$$mod ]; then \ mkdir -p $$(1)/$(MODULES_SUBDIR) ; \ $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \ - elif grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \ - echo "NOTICE: module '$$$$$$$$mod' is built-in."; \ + elif [ -e "$(LINUX_DIR)/modules.builtin" ]; then \ + if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \ + echo "NOTICE: module '$$$$$$$$mod' is built-in."; \ + else \ + echo "ERROR: module '$$$$$$$$mod' is missing."; \ + exit 1; \ + fi; \ else \ - echo "ERROR: module '$$$$$$$$mod' is missing."; \ - exit 1; \ + echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in."; \ fi; \ done; $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) |