merge: release/banner: drop release name and update banner

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/include/version.mk b/include/version.mk
index 1a0d3c990b5db305b75f52f0ed5a4c9a23092888..a869ed6f5490dff10c8235097ec1c170b9ad1fb2 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -10,13 +10,10 @@
 # REVISION:=x
 # SOURCE_DATE_EPOCH:=x
 
-RELEASE:=Reboot
-
 PKG_CONFIG_DEPENDS += \
        CONFIG_VERSION_BUG_URL \
        CONFIG_VERSION_NUMBER \
        CONFIG_VERSION_CODE \
-       CONFIG_VERSION_NICK \
        CONFIG_VERSION_REPO \
        CONFIG_VERSION_DIST \
        CONFIG_VERSION_MANUFACTURER \
@@ -36,18 +33,15 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
 VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
-VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
-VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
-
 VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
 VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
 
 VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
-VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE)
+VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
 VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
 
 VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
-VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE)
+VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
 
 VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
 VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/)
@@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
        -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
        -e 's,%C,$(VERSION_CODE),g' \
        -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \
-       -e 's,%N,$(VERSION_NICK),g' \
-       -e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \
        -e 's,%D,$(VERSION_DIST),g' \
        -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
        -e 's,%R,$(REVISION),g' \

diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index 4ec646a9334cf666dccb4c96faf92e0216b9f303..f3af3c014f20f1b1157bde1cadae64cab0189c9f 100644 (file)
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,10 +1,8 @@
-     _________
-    /        /\      _    ___ ___  ___
-   /  LE    /  \    | |  | __|   \| __|
-  /    DE  /    \   | |__| _|| |) | _|
- /________/  LE  \  |____|___|___/|___|                      lede-project.org
- \        \   DE /
-  \    LE  \    /  -----------------------------------------------------------
-   \  DE    \  /    %N (%V, %C)
-    \________\/    -----------------------------------------------------------
-
+  _______                     ________        __
+ |       |.-----.-----.-----.|  |  |  |.----.|  |_
+ |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
+ |_______||   __|_____|__|__||________||__|  |____|
+          |__| W I R E L E S S   F R E E D O M
+ -----------------------------------------------------
+ %D %V, %C
+ -----------------------------------------------------