diff options
author | Jo-Philipp Wich <jo@mein.io> | 2016-04-13 00:31:15 +0200 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2016-04-13 00:31:15 +0200 |
commit | 32a0b8c1045481cd442c82b8b5cbb330f613c7a7 (patch) | |
tree | 8da43effb221a9d5a51a55713b675b14c8969fa8 /include/feeds.mk | |
parent | 5170393f8cae3c5acac61bd6ac6e127f9727cee4 (diff) | |
download | upstream-32a0b8c1045481cd442c82b8b5cbb330f613c7a7.tar.gz upstream-32a0b8c1045481cd442c82b8b5cbb330f613c7a7.tar.bz2 upstream-32a0b8c1045481cd442c82b8b5cbb330f613c7a7.zip |
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 <jo@mein.io>
Diffstat (limited to 'include/feeds.mk')
-rw-r--r-- | include/feeds.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/feeds.mk b/include/feeds.mk index ef7a09f4cd..a5ce877967 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 |