summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-15 22:51:12 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-15 22:51:12 +0000
commit069301889a47b5abc5ff34c8674d2e81a00934ba (patch)
treeea80a222d748c2dcfa5e4d32687a4329e685ddf1
parentdcd9e5ec4d406ffa11da844bf28d64268448919e (diff)
rewrite of the metadata scanning - cleaner code, faster scanning, recursive scanning and better handling of makefile dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7981 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile7
-rw-r--r--include/scan.mk76
-rw-r--r--package/kernel/Makefile1
3 files changed, 49 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index f4b153c17..4120b6295 100644
--- a/Makefile
+++ b/Makefile
@@ -44,10 +44,13 @@ endif
package/%/Makefile: ;
target/%/Makefile: ;
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
+
tmp/.packageinfo tmp/.targetinfo: FORCE
mkdir -p tmp/info
- $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="" SCAN_TARGET_DEPS="$(wildcard target/*/Makefile include/kernel*.mk)" SCAN_EXTRA=""
- $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(wildcard package/*/Makefile include/package*.mk include/kernel.mk)" SCAN_EXTRA=""
+ $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk" SCAN_EXTRA=""
+ $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_EXTRA=""
tmpinfo-clean: FORCE
-rm -rf tmp/.*info
diff --git a/include/scan.mk b/include/scan.mk
index 976eb3842..01f49aded 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -1,9 +1,12 @@
include $(TOPDIR)/include/verbose.mk
+all: tmp/.$(SCAN_TARGET)
+
SCAN_TARGET ?= packageinfo
SCAN_NAME ?= package
SCAN_DIR ?= package
-SCAN_DEPS ?= include/package.mk
+TARGET_STAMP:=tmp/info/.files-$(SCAN_TARGET).stamp
+FILELIST:=tmp/info/.files-$(SCAN_TARGET)-$(SCAN_COOKIE)
ifeq ($(IS_TTY),1)
define progress
@@ -15,41 +18,48 @@ else
endef
endif
-SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(wildcard $(SCAN_DIR)/*/Makefile))
-tmp/.$(SCAN_TARGET):
- @($(call progress,Collecting $(SCAN_NAME) info: merging...))
- for file in $(SCAN); do \
- cat tmp/info/.$(SCAN_TARGET)-$$file; \
- done > $@
- @($(call progress,Collecting $(SCAN_NAME) info: done))
- @echo
-
-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)-*
- touch $@
-endif
-
-# FIXME: generate this dynamically?
-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) $(SCAN_TARGET_DEPS) $(SCAN_DEPS)
- tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP) $(SCAN_TARGET_DEPS)
- 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; \
+define PackageDir
+ tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(1)
+ tmp/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(1)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(1)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(1)/$(DEP))))
+ { \
+ $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(1)) \
+ echo Source-Makefile: $(SCAN_DIR)/$(1)/Makefile; \
+ $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(1) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(1)/Makefile" >&2; \
echo; \
} > $$@ || true
-)
-
endef
-$(eval $(call scanfiles))
+
+$(FILELIST):
+ rm -f tmp/info/.files-$(SCAN_TARGET)-*
+ find $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
+
+tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
+ ( \
+ cat $< | awk '{print "$(SCAN_DIR)/" $$0 "/Makefile" }' | xargs grep -HE '^ *SCAN_DEPS *= *' | awk -F: '{ gsub(/^.*DEPS *= */, "", $$2); print "DEPS_" $$1 "=" $$2 }'; \
+ awk -v deps="$$DEPS" '{ \
+ print "$$(eval $$(call PackageDir," $$0 "))"; \
+ } ' < $<; \
+ true; \
+ ) > $@
+
+-include tmp/info/.files-$(SCAN_TARGET).mk
+
+$(TARGET_STAMP):
+ ( \
+ $(NO_TRACE_MAKE) $(FILELIST); \
+ MD5SUM=$$(cat $(FILELIST) | (md5sum || md5) | awk '{print $$1}'); \
+ [ -f "$@.$$MD5SUM" ] || { \
+ rm -f $@.*; \
+ touch $@.$$MD5SUM; \
+ touch $@; \
+ } \
+ )
+
+tmp/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
+ $(call progress,Collecting $(SCAN_NAME) info: merging...)
+ cat $(FILELIST) | awk '{print "tmp/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
+ $(call progress,Collecting $(SCAN_NAME) info: done)
+ echo
FORCE:
.PHONY: FORCE
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 8f98be384..d7179524c 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -17,6 +17,7 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
# build all in-tree kmod-* packages by default
KMOD_DEFAULT:=m
+SCAN_DEPS=modules/*.mk
include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)