diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 21:07:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 21:07:29 +0000 |
| commit | 08c5cb8c23540d2573e185a92358e6a358603c03 (patch) | |
| tree | d03625ced36706ad03dbd62c3e7fc2ca8ad90306 | |
| parent | aabda0f133ce61531c4951ccc1c21381e3748cbb (diff) | |
| download | upstream-08c5cb8c23540d2573e185a92358e6a358603c03.tar.gz upstream-08c5cb8c23540d2573e185a92358e6a358603c03.tar.bz2 upstream-08c5cb8c23540d2573e185a92358e6a358603c03.zip | |
fix metadata scan for profile split
SVN-Revision: 6515
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | include/scan.mk | 10 |
2 files changed, 17 insertions, 5 deletions
@@ -45,7 +45,7 @@ ifeq ($(FORCE),) endif define stamp -tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) +tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) endef STAMP_pkginfo=$(call stamp,pkginfo,package) @@ -57,19 +57,23 @@ $(STAMP_$(1)): @rm -f tmp/info/.stamp-$(1)* @touch $$@ -$(foreach FILE,$(shell ls $(2)/*/Makefile), +$(foreach FILE,$(shell ls $(2)/*/Makefile $(5)), tmp/.$(1): $(FILE) $(FILE): ) +ifneq ($(5),) +tmp/.$(1): $(shell ls $(5)) +endif + tmp/.$(1): $(STAMP_$(1)) $(4) @echo -n Collecting $(3) info... - @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)" + @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)" SCAN_EXTRA="$(5)" endef $(eval $(call scan_info,pkginfo,package,package,include/package.mk)) -$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk)) +$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk,target/linux/*/profiles/*.mk)) tmpinfo-clean: FORCE @-rm -rf tmp/.pkginfo tmp/.targetinfo diff --git a/include/scan.mk b/include/scan.mk index 7725fc713a..ff23e0961c 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -24,10 +24,18 @@ tmp/.$(SCAN_TARGET): @($(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)-* + mkdir -p $(shell dirname $@) + touch $@ +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 + tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DEPS) $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP) { \ $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \ echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \ |