From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 9 Dec 2017 15:01:14 +0000 (+0100)
Subject: merge: properly remove %n / %N references
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d23e1e1e1a3eede59d7da21cafe0ba69c0e81458;p=openwrt%2Fstaging%2Fblogic.git

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 f89687a27e61..b85438301caf 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 da86208f7f70..d03400ca0530 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 88ec50a8e864..45ca1306f7d7 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