merge: release/banner: drop release name and update banner
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
This commit is contained in:
parent
34bbbbf9c3
commit
bf5cef47b3
2 changed files with 10 additions and 20 deletions
|
@ -10,13 +10,10 @@
|
||||||
# REVISION:=x
|
# REVISION:=x
|
||||||
# SOURCE_DATE_EPOCH:=x
|
# SOURCE_DATE_EPOCH:=x
|
||||||
|
|
||||||
RELEASE:=Reboot
|
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS += \
|
PKG_CONFIG_DEPENDS += \
|
||||||
CONFIG_VERSION_BUG_URL \
|
CONFIG_VERSION_BUG_URL \
|
||||||
CONFIG_VERSION_NUMBER \
|
CONFIG_VERSION_NUMBER \
|
||||||
CONFIG_VERSION_CODE \
|
CONFIG_VERSION_CODE \
|
||||||
CONFIG_VERSION_NICK \
|
|
||||||
CONFIG_VERSION_REPO \
|
CONFIG_VERSION_REPO \
|
||||||
CONFIG_VERSION_DIST \
|
CONFIG_VERSION_DIST \
|
||||||
CONFIG_VERSION_MANUFACTURER \
|
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:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
|
||||||
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
|
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:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
|
||||||
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
|
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
|
||||||
|
|
||||||
VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
|
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_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST))
|
||||||
|
|
||||||
VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
|
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:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL))
|
||||||
VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/)
|
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,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \
|
||||||
-e 's,%C,$(VERSION_CODE),g' \
|
-e 's,%C,$(VERSION_CODE),g' \
|
||||||
-e 's,%c,\L$(subst $(space),_,$(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,$(VERSION_DIST),g' \
|
||||||
-e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
|
-e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \
|
||||||
-e 's,%R,$(REVISION),g' \
|
-e 's,%R,$(REVISION),g' \
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
_________
|
_______ ________ __
|
||||||
/ /\ _ ___ ___ ___
|
| |.-----.-----.-----.| | | |.----.| |_
|
||||||
/ LE / \ | | | __| \| __|
|
| - || _ | -__| || | | || _|| _|
|
||||||
/ DE / \ | |__| _|| |) | _|
|
|_______|| __|_____|__|__||________||__| |____|
|
||||||
/________/ LE \ |____|___|___/|___| lede-project.org
|
|__| W I R E L E S S F R E E D O M
|
||||||
\ \ DE /
|
-----------------------------------------------------
|
||||||
\ LE \ / -----------------------------------------------------------
|
%D %V, %C
|
||||||
\ DE \ / %N (%V, %C)
|
-----------------------------------------------------
|
||||||
\________\/ -----------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue