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 | |
| 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>
| -rw-r--r-- | include/feeds.mk | 6 | ||||
| -rw-r--r-- | package/base-files/files/etc/openwrt_release | 3 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 2 |
3 files changed, 4 insertions, 7 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 diff --git a/package/base-files/files/etc/openwrt_release b/package/base-files/files/etc/openwrt_release index da86208f7f..d03400ca05 100644 --- a/package/base-files/files/etc/openwrt_release +++ b/package/base-files/files/etc/openwrt_release @@ -1,8 +1,7 @@ DISTRIB_ID='%D' DISTRIB_RELEASE='%V' DISTRIB_REVISION='%R' -DISTRIB_CODENAME='%n' DISTRIB_TARGET='%S' DISTRIB_ARCH='%A' -DISTRIB_DESCRIPTION='%D %N %V %C' +DISTRIB_DESCRIPTION='%D %V %C' DISTRIB_TAINTS='%t' diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 88ec50a8e8..45ca1306f7 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -199,8 +199,6 @@ if VERSIONOPT %v .. Configured release version number or "snapshot", lowercase %C .. Configured release revision code or value of %R, uppercase %c .. Configured release revision code or value of %R, lowercase - %N .. Release name, uppercase - %n .. Release name, lowercase %D .. Distribution name or "OpenWrt", uppercase %d .. Distribution name or "openwrt", lowercase %T .. Target name |