diff options
| author | Sven Roederer <devel-sven@geroedel.de> | 2019-03-09 15:00:15 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2019-10-27 14:32:13 +0100 |
| commit | b81cee86e63d4421072839ec8a3780d8afff9337 (patch) | |
| tree | 795a456a9407b15aee34c8baacde2c40d2d79c69 | |
| parent | cf8f9af0e096a58816be2917c7f5cab696a01d8c (diff) | |
| download | upstream-b81cee86e63d4421072839ec8a3780d8afff9337.tar.gz upstream-b81cee86e63d4421072839ec8a3780d8afff9337.tar.bz2 upstream-b81cee86e63d4421072839ec8a3780d8afff9337.zip | |
build: have scripts/feeds honor all toplevel .mk-files of a feed
The luci and freifunk feed having a common Makefile included by the
individual packages. Currently a change to this file will be ignored
when running "scripts/feeds update".
When we are updating for a feed, add a dependency for all .mk files
in the root of it.
Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
| -rw-r--r-- | include/scan.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/scan.mk b/include/scan.mk index d9cd4f7e8c..7df5dc6486 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -12,10 +12,17 @@ OVERRIDELIST:=$(TMP_DIR)/info/.overrides-$(SCAN_TARGET)-$(SCAN_COOKIE) export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) +define feedname +$(if $(patsubst feeds/%,,$(1)),,$(word 2,$(subst /, ,$(1)))) +endef + ifeq ($(SCAN_NAME),target) SCAN_DEPS=image/Makefile profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk image/*.mk else SCAN_DEPS=$(TOPDIR)/include/package*.mk +ifneq ($(call feedname,$(SCAN_DIR)),) + SCAN_DEPS += $(TOPDIR)/feeds/$(call feedname,$(SCAN_DIR))/*.mk +endif endif ifeq ($(IS_TTY),1) @@ -34,10 +41,6 @@ else endef endif -define feedname -$(if $(patsubst feeds/%,,$(1)),,$(word 2,$(subst /, ,$(1)))) -endef - define PackageDir $(TMP_DIR)/.$(SCAN_TARGET): $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1) $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP)))) |