aboutsummaryrefslogtreecommitdiffstats
path: root/include/kernel.mk
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-13 11:45:09 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-13 11:45:09 +0000
commit14482ced5ef3e3d1902eecc6dfe1c799da8ac602 (patch)
treeaab17a6886cf79329633ca035d3bb00ba5acf91d /include/kernel.mk
parentd2316b2a45319cc12f97a6ebed6f2a84bf4fca5c (diff)
downloadupstream-14482ced5ef3e3d1902eecc6dfe1c799da8ac602.tar.gz
upstream-14482ced5ef3e3d1902eecc6dfe1c799da8ac602.tar.bz2
upstream-14482ced5ef3e3d1902eecc6dfe1c799da8ac602.zip
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. SVN-Revision: 29018
Diffstat (limited to 'include/kernel.mk')
-rw-r--r--include/kernel.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 1591c36135..1af072d6bb 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))