From 32a0b8c1045481cd442c82b8b5cbb330f613c7a7 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 13 Apr 2016 00:31:15 +0200 Subject: include/version.mk: rework repository url handling - Add %A placeholder for substituting the package architecture - Change %U placeholder to refer to the toplevel repository URL - Construct package feed URLs relative to the toplevel one to match new layout Signed-off-by: Jo-Philipp Wich --- include/feeds.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include/feeds.mk') diff --git a/include/feeds.mk b/include/feeds.mk index ef7a09f..a5ce877 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -43,12 +43,10 @@ endef # 1: destination file define FeedSourcesAppend ( \ + echo "src/gz %n_core %U/targets/%S/packages"; \ $(strip $(if $(CONFIG_PER_FEED_REPO), \ - $(foreach feed,base kernel $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/$(feed)";) \ + $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/packages/%A/$(feed)";) \ $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \ - $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/$(feed)";)) \ - , \ - echo "src/gz %n %U"; \ - )) \ + $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/packages/%A/$(feed)";)))) \ ) >> $(1) endef -- cgit v1.1