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>

diff --git a/include/feeds.mk b/include/feeds.mk
index f89687a27e61397d8e718b41ea2c84690640f849..b85438301cafd11c322fa5951bbda19de7cb1420 100644 (file)
--- 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 da86208f7f70a75ced79885d5bd2d6d885c3dea8..d03400ca05306d2ad7eef66a219f3290da0309f1 100644 (file)
--- 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 88ec50a8e8647cff4022f8ff493b620e9e0151d4..45ca1306f7d7f94594c8fe6e1d96169b940501c0 100644 (file)
--- 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