include/kernel.mk: don't check for modules.builtin on 2.6.32-
authorJonas Gorski <jogo@openwrt.org>
Sun, 13 Nov 2011 11:45:09 +0000 (11:45 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sun, 13 Nov 2011 11:45:09 +0000 (11:45 +0000)
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

include/kernel.mk

index 1591c36..1af072d 100644 (file)
@@ -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))