diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-12-09 16:01:14 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-12-09 16:01:14 +0100 |
| commit | d23e1e1e1a3eede59d7da21cafe0ba69c0e81458 (patch) | |
| tree | ff0b8bcec623961e400a9677d72a7325426f80e3 /include | |
| parent | 69d22a6bf68c19b32da8d596a6488a791b6ad2bd (diff) | |
| download | upstream-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.tar.gz upstream-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.tar.bz2 upstream-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.zip | |
merge: properly remove %n / %N references
- use %d instead of %n for opkg feed identifiers
- remove %n / %N references from version files
Fixes bf5cef47b3 merge: release/banner: drop release name and update banner.
Fixes FS#1213.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'include')
| -rw-r--r-- | include/feeds.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/feeds.mk b/include/feeds.mk index f89687a27e..b85438301c 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -41,10 +41,10 @@ endef # 1: destination file define FeedSourcesAppend ( \ - echo "src/gz %n_core %U/targets/%S/packages"; \ + echo "src/gz %d_core %U/targets/%S/packages"; \ $(strip $(if $(CONFIG_PER_FEED_REPO), \ - $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/packages/%A/$(feed)";) \ + $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(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/packages/%A/$(feed)";)))) \ + $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \ ) >> $(1) endef |