summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-12-09 16:01:14 +0100
committerJo-Philipp Wich <jo@mein.io>2017-12-09 16:01:14 +0100
commitd23e1e1e1a3eede59d7da21cafe0ba69c0e81458 (patch)
treeff0b8bcec623961e400a9677d72a7325426f80e3 /package
parent69d22a6bf68c19b32da8d596a6488a791b6ad2bd (diff)
downloadmtk-20170518-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.zip
mtk-20170518-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.tar.gz
mtk-20170518-d23e1e1e1a3eede59d7da21cafe0ba69c0e81458.tar.bz2
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>
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/etc/openwrt_release3
-rw-r--r--package/base-files/image-config.in2
2 files changed, 1 insertions, 4 deletions
diff --git a/package/base-files/files/etc/openwrt_release b/package/base-files/files/etc/openwrt_release
index da86208..d03400c 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 88ec50a..45ca130 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