aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2016-05-22 11:49:54 +0300
committerJo-Philipp Wich <jo@mein.io>2016-05-24 13:30:58 +0200
commit3193053df7d27bde82fbcc310e4404cc43f39313 (patch)
tree1f092cc3a58adceda9253c9b9e270edd0147b0a0
parent6707d9750aa37df75fc1d5c9e64ab599f608c3a2 (diff)
downloadupstream-3193053df7d27bde82fbcc310e4404cc43f39313.tar.gz
upstream-3193053df7d27bde82fbcc310e4404cc43f39313.tar.bz2
upstream-3193053df7d27bde82fbcc310e4404cc43f39313.zip
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>
-rw-r--r--include/toplevel.mk2
-rw-r--r--include/version.mk2
-rw-r--r--package/base-files/files/etc/banner2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 7ef5c6186a..e00a24ab6a 100644
--- 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 15a566b508..ef8024002f 100644
--- 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 ae2f16f513..66dc14be06 100644
--- 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)
\________\/ -----------------------------------------------------------