From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 9 Dec 2017 22:25:21 +0000 (+0100)
Subject: base-files: remove remaining uses of %N, and drop VERSION_NICK config symbol
X-Git-Tag: v18.06.0-rc1~1605
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d573b1287e1b4ace7680d5dbfde20ba25e428b17;p=openwrt%2Fstaging%2Fpepe2k.git

base-files: remove remaining uses of %N, and drop VERSION_NICK config symbol

Fixes d23e1e1e1a "merge: properly remove %n / %N references"

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/package/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release
index 21abf969e1..82ade59406 100644
--- a/package/base-files/files/usr/lib/os-release
+++ b/package/base-files/files/usr/lib/os-release
@@ -1,8 +1,8 @@
 NAME="%D"
-VERSION="%V, %N"
+VERSION="%V"
 ID="%d"
 ID_LIKE="lede openwrt"
-PRETTY_NAME="%D %N %V"
+PRETTY_NAME="%D %V"
 VERSION_ID="%v"
 HOME_URL="%m"
 BUG_URL="%b"
@@ -15,4 +15,4 @@ LEDE_DEVICE_MANUFACTURER="%M"
 LEDE_DEVICE_MANUFACTURER_URL="%m"
 LEDE_DEVICE_PRODUCT="%P"
 LEDE_DEVICE_REVISION="%h"
-LEDE_RELEASE="%D %N %V %C"
+LEDE_RELEASE="%D %V %C"
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 45ca1306f7..dbbd60b152 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -163,13 +163,6 @@ if VERSIONOPT
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
 
-	config VERSION_NICK
-		string
-		prompt "Release version nickname"
-		help
-			This is the release codename embedded in the image.
-			If unspecified, it defaults to the name of source branch.
-
 	config VERSION_NUMBER
 		string
 		prompt "Release version number"