Return -ENODEV, when device is absent. This should fix lockups on boot.

[openwrt.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index a7f74ec..1597112 100644 (file)
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -1,6 +1,6 @@
 include $(TOPDIR)/include/verbose.mk
 
-SCAN_TARGET ?= pkginfo
+SCAN_TARGET ?= packageinfo
 SCAN_NAME ?= package
 SCAN_DIR ?= package
 SCAN_DEPS ?= include/package.mk
@@ -15,7 +15,7 @@ else
   endef
 endif
 
-SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(shell ls $(SCAN_DIR)/*/Makefile))
+SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(wildcard $(SCAN_DIR)/*/Makefile))
 tmp/.$(SCAN_TARGET):
        @($(call progress,Collecting $(SCAN_NAME) info: merging...))
        for file in $(SCAN); do \
@@ -28,25 +28,24 @@ ifneq ($(SCAN_EXTRA),)
 SCAN_STAMP=tmp/info/.scan-$(SCAN_TARGET)-$(shell ls $(SCAN_EXTRA) 2>/dev/null | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
 $(SCAN_STAMP):
        rm -f tmp/info/.scan-$(SCAN_TARGET)-*
-       mkdir -p $(shell dirname $@)
        touch $@
 endif
 
 # FIXME: generate this dynamically?
-ifeq ($(SCAN_TARGET),pkginfo)
-tmp/info/.pkginfo-kernel: $(shell ls package/kernel/modules/*.mk)
+ifeq ($(SCAN_TARGET),packageinfo)
+tmp/info/.packageinfo-kernel: $(wildcard package/kernel/modules/*.mk)
 endif
 
 define scanfiles
 $(foreach FILE,$(SCAN),
-  tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) FORCE
-  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DEPS) $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP)
-       { \
+  tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_DEPS)
+  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP)
+       grep -E 'include (\$$$$\(INCLUDE_DIR\)|\$$$$\(TOPDIR\)/include)/' $(SCAN_DIR)/$(FILE)/Makefile >/dev/null && { \
                $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \
                echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \
                $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(FILE) 3>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(FILE)/Makefile" >&2; \
                echo; \
-       } > $$@
+       } > $$@ || true
 )
 
 endef