diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-12-09 23:25:21 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-12-09 23:27:41 +0100 |
| commit | d573b1287e1b4ace7680d5dbfde20ba25e428b17 (patch) | |
| tree | d9d65c98d7841f6fae36cdf14d800ece5c412e96 /package/base-files | |
| parent | d23e1e1e1a3eede59d7da21cafe0ba69c0e81458 (diff) | |
| download | mtk-20170518-d573b1287e1b4ace7680d5dbfde20ba25e428b17.zip mtk-20170518-d573b1287e1b4ace7680d5dbfde20ba25e428b17.tar.gz mtk-20170518-d573b1287e1b4ace7680d5dbfde20ba25e428b17.tar.bz2 | |
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>
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/files/usr/lib/os-release | 6 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/package/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release index 21abf96..82ade59 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 45ca130..dbbd60b 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" |