Re: [OpenWrt-Devel] [PATCH v4 2/8] merge: release/banner: drop release name and update banner

2017-11-07 Thread Yousong Zhou 
On 7 November 2017 at 16:45, Zoltan HERPAI  wrote:
> Signed-off-by: Zoltan HERPAI 
> ---
>  include/version.mk  | 12 ++--
>  package/base-files/files/etc/banner | 18 --
>  2 files changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/include/version.mk b/include/version.mk
> index 1a0d3c9..a869ed6 100644
> --- 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 \

we need to also remove it from package/base-files/image-config.in

Regards,
yousong
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v4 2/8] merge: release/banner: drop release name and update banner

2017-11-07 Thread Zoltan HERPAI 
Signed-off-by: Zoltan HERPAI 
---
 include/version.mk  | 12 ++--
 package/base-files/files/etc/banner | 18 --
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/include/version.mk b/include/version.mk
index 1a0d3c9..a869ed6 100644
--- 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 4ec646a..f3af3c0 100644
--- 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
+ -
-- 
1.9.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel