Centralize setting of all version info to include/version.mk

Centralize setting all version information in include/version.mk
* Set RELEASE env variable in include/version.mk instead of toplevel.mk.
  Stop exporting the variable.
* Remove hardcoded release name from /etc/banner

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 7ef5c6186a8abb7d20381954cc191d91acec2a5a..e00a24ab6ad647aa52760c1d644db194ee455689 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -6,7 +6,6 @@
 # See /LICENSE for more information.
 #
 
-RELEASE:=Designated Driver
 PREP_MK= OPENWRT_BUILD= QUIET=0
 
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
@@ -20,7 +19,6 @@ else
 endif
 
 HOSTCC ?= $(CC)
-export RELEASE
 export REVISION
 export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
 export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))

diff --git a/include/version.mk b/include/version.mk
index 15a566b508a5ba219820f36a3cb91521279271c0..ef8024002f9ea8ebc44428354347d4cfa1d45efb 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -9,6 +9,8 @@
 # Substituted by SDK, do not remove
 # REVISION:=x
 
+RELEASE:=Reboot
+
 PKG_CONFIG_DEPENDS += \
        CONFIG_VERSION_NUMBER \
        CONFIG_VERSION_NICK \

diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index ae2f16f5139b46e14bc4aed690ec05cd08a338de..66dc14be0690c8b214ec8222d7950bb25b2725f2 100644 (file)
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -5,6 +5,6 @@
  /________/  LE  \  |____|___|___/|___|                      lede-project.org
  \        \   DE /
   \    LE  \    /  -----------------------------------------------------------
-   \  DE    \  /    Reboot (%C, %R)
+   \  DE    \  /    %N (%C, %R)
     \________\/    -----------------------------------------------------------