Re: [OpenWrt-Devel] [PATCH] build: have scripts/feeds honor feed.mk of the individual feed
Am Freitag, 8. März 2019, 07:28:21 CET schrieb Jo-Philipp Wich: > Hi, > > tbh I don't really like the approach of arbitrarily defining "feed.mk" > to be a change source. Can we extend this to take all toplevel *.mk > files into consideration? I think this falls more in line with what > people would expect. Jo, I sent an updated patch [1] according to your comment. Can this be merged now? Sven 1 - https://patchwork.ozlabs.org/patch/1053839/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] build: have scripts/feeds honor feed.mk of the individual feed
Hi, tbh I don't really like the approach of arbitrarily defining "feed.mk" to be a change source. Can we extend this to take all toplevel *.mk files into consideration? I think this falls more in line with what people would expect. ~ Jo signature.asc Description: OpenPGP digital signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] build: have scripts/feeds honor feed.mk of the individual feed
On 2019-03-07 17:28, Jo-Philipp Wich wrote: Hi, I do not understand the exact purpose of this patch. As far as I know, there is no "feed.mk" anywhere in the LuCI repo. Jo, you are correct, there is currently no such file. But I'm preparing some PRs for LuCI and freifunk feed [1], [2] which will create such file. This commit is one end of the horse ... Sven 1 - https://github.com/SvenRoederer/openwrt-luci/tree/feed_mk 2 - https://github.com/SvenRoederer/freifunk_openwrt-packages/tree/fix_mod-freifunk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] build: have scripts/feeds honor feed.mk of the individual feed
Hi, I do not understand the exact purpose of this patch. As far as I know, there is no "feed.mk" anywhere in the LuCI repo. ~ Jo signature.asc Description: OpenPGP digital signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] build: have scripts/feeds honor feed.mk of the individual 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". Add a check for a Makefile "feed.mk" in the root of a feed and include this to the dependencies. Signed-off-by: Sven Roederer --- include/scan.mk | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/scan.mk b/include/scan.mk index d9cd4f7e8c..134c5f6407 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -12,10 +12,18 @@ 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 + FEED_COMMON_MK=$(TOPDIR)/feeds/$(call feedname,$(SCAN_DIR))/feed.mk +ifneq ($(wildcard $(FEED_COMMON_MK)),) + SCAN_DEPS += $(FEED_COMMON_MK) +endif endif ifeq ($(IS_TTY),1) @@ -34,10 +42,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 -- 2.11.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
