[OpenWrt-Devel] merge: add OpenWrt branding

[Yousong Zhou]

On 24 October 2017 at 19:46, Zoltan HERPAI <wigyori at uid0.hu> wrote:
> Given that we've decided to sail under the same flag for
> the benefit of the whole community, and acknowledge the
> achievements of the LEDE project, let's start the final
> steps of the merge.
>
> The git and other sources are untouched until the infra merge.
>
> Signed-off-by: Zoltan HERPAI <wigyori at uid0.hu>
> Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
>

...

> diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
> index a8311fc..bbed567 100755
> --- a/package/base-files/files/bin/config_generate
> +++ b/package/base-files/files/bin/config_generate
> @@ -223,7 +223,7 @@ generate_static_system() {
>         uci -q batch <<-EOF
>                 delete system. at system[0]
>                 add system system
> -               set system. at system[-1].hostname='LEDE'
> +               set system. at system[-1].hostname='OpenWrt'
>                 set system. at system[-1].timezone='UTC'
>                 set system. at system[-1].ttylogin='0'
>                 set system. at system[-1].log_size='64'
> @@ -233,10 +233,10 @@ generate_static_system() {
>                 set system.ntp='timeserver'
>                 set system.ntp.enabled='1'
>                 set system.ntp.enable_server='0'
> -               add_list system.ntp.server='0.lede.pool.ntp.org'
> -               add_list system.ntp.server='1.lede.pool.ntp.org'
> -               add_list system.ntp.server='2.lede.pool.ntp.org'
> -               add_list system.ntp.server='3.lede.pool.ntp.org'
> +               add_list system.ntp.server='0.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='1.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='2.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='3.openwrt.pool.ntp.org'
>         EOF
>
>         if json_is_a system object; then
> diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
> index 4ec646a..af51b5a 100644
> --- a/package/base-files/files/etc/banner
> +++ b/package/base-files/files/etc/banner
> @@ -1,10 +1,13 @@
> -     _________
> -    /        /\      _    ___ ___  ___
> -   /  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
> + -----------------------------------------------------
> + DESIGNATED DRIVER (%C, %R)
> + -----------------------------------------------------
> +  * 2 oz. Orange Juice         Combine all juices in a
> +  * 2 oz. Pineapple Juice      tall glass filled with
> +  * 2 oz. Grapefruit Juice     ice, stir well.
> +  * 2 oz. Cranberry Juice
> + -----------------------------------------------------

Hi,

Changing the logo is okay, but I'd like to propose that we continue to
use LEDE's current numbering scheme of the form YY.MM.  It's simpler
and more straightforward and will make the transition process more
smooth as new releases will continue to use LEDE's codebase and build
infrastructure.

Links like http://www.{lede-project,openwrt}.org/bugs need to be
examined and fixed first.  Infrastructures like NTP servers will need
to keep running until maybe the EOL of kernel 4.4

                yousong