add check for openwrt build system makefiles when scanning for metadata

[openwrt/openwrt.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index ff23e0961ca24a53d51128b409f0ff46cfe77899..aa7c2e74b5e3ba6dd2a647ba7c15f651dd9a4192 100644 (file)
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -28,20 +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)
+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)
-       { \
+       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