KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2017-12-09 23:25:21 +01:00
parent d23e1e1e1a
commit d573b1287e
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/base-files/files/usr/lib/os-release
View file

@ -1,8 +1,8 @@
NAME="%D" NAME="%D"
VERSION="%V, %N" VERSION="%V"
ID="%d" ID="%d"
ID_LIKE="lede openwrt" ID_LIKE="lede openwrt"
PRETTY_NAME="%D %N %V" PRETTY_NAME="%D %V"
VERSION_ID="%v" VERSION_ID="%v"
HOME_URL="%m" HOME_URL="%m"
BUG_URL="%b" BUG_URL="%b"
@ -15,4 +15,4 @@ LEDE_DEVICE_MANUFACTURER="%M"
LEDE_DEVICE_MANUFACTURER_URL="%m" LEDE_DEVICE_MANUFACTURER_URL="%m"
LEDE_DEVICE_PRODUCT="%P" LEDE_DEVICE_PRODUCT="%P"
LEDE_DEVICE_REVISION="%h" LEDE_DEVICE_REVISION="%h"
LEDE_RELEASE="%D %N %V %C" LEDE_RELEASE="%D %V %C"

7
package/base-files/image-config.in
View file

@ -163,13 +163,6 @@ if VERSIONOPT
This is the name of the release distribution. This is the name of the release distribution.
If unspecified, it defaults to OpenWrt. 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 config VERSION_NUMBER
string string
prompt "Release version number" prompt "Release version number"