[OpenWrt-Devel] merge: add OpenWrt branding

Message ID 1508845578-30041-1-git-send-email-wigyori@uid0.hu
State New
Headers show
Series
  • [OpenWrt-Devel] merge: add OpenWrt branding
Related show

Commit Message

Zoltan HERPAI Oct. 24, 2017, 11:46 a.m.
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@uid0.hu>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

Comments

Yousong Zhou Oct. 24, 2017, 12:38 p.m. | #1
On 24 October 2017 at 19:46, Zoltan HERPAI <wigyori@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@uid0.hu>
> Signed-off-by: Imre Kaloz <kaloz@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.@system[0]
>                 add system system
> -               set system.@system[-1].hostname='LEDE'
> +               set system.@system[-1].hostname='OpenWrt'
>                 set system.@system[-1].timezone='UTC'
>                 set system.@system[-1].ttylogin='0'
>                 set system.@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
Jo-Philipp Wich Oct. 24, 2017, 1:07 p.m. | #2
Hi,

comments inline.

> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

Given the fact that we explicitely wanted to avoid @openwrt.org mails
and that this was one of the discussion points leading to the split I
find it delicate to seal the merging commit with exactly such a S-o-b.

Combined with ...

  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
  Tue, 18 Oct 2016 11:42:06 +0200

... this looks to me like nothing was learned from past experiences and
that all that matters here is having the own name attached to the work
being done.


Anyhow, on to the code.

> diff --git a/Config.in b/Config.in
> index ddbc4e2..d30c048 100644
> --- a/Config.in
> +++ b/Config.in

[...]

>  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.openwrt.org/snapshots)

We need to setup the server first or delegate downloads.openwrt.org to
downloads.lede-project.org or add a rewrite rule to redirect
http://downloads.openwrt.org/snapshots/(.*) to
http://downloads.lede-project.org/snapshots/$1 for now.

>  VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
> -VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
> +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)

Likewise.

>  VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
> -VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
> +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)

Undecided.

>  
>  VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
>  VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)

[...]

> 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)

Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
r3560-79f57e422d) are more useful under the new version scheme than "%C,
%R" (r3560-79f57e422d, r3560-79f57e422d)

> + -----------------------------------------------------
> +  * 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
> + -----------------------------------------------------
> diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
> index 8c5f677..54c0e3e 100755
> --- a/package/base-files/files/etc/init.d/system
> +++ b/package/base-files/files/etc/init.d/system
> @@ -7,7 +7,7 @@ USE_PROCD=1
>  validate_system_section()
>  {
>  	uci_validate_section system system "${1}" \
> -		'hostname:string:lede' \
> +		'hostname:string:openwrt' \

While we're at it we should properly capitalize the default to "OpenWrt".

>  		'conloglevel:uinteger' \
>  		'buffersize:uinteger' \
>  		'timezone:string:UTC' \

[...]

> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
> index 6b8be1c..fd8365a 100755
> --- a/package/network/services/uhttpd/files/uhttpd.init
> +++ b/package/network/services/uhttpd/files/uhttpd.init
> @@ -52,7 +52,7 @@ generate_keys() {
>  	[ -n "$GENKEY_CMD" ] && {
>  		$GENKEY_CMD \
>  			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
> -			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
> +			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"

Maybe we should adjust the defaults here to match the shipped config.

>  		sync
>  		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
>  		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
> diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
> index 14a33c5..c9ef626 100644
> --- a/package/network/utils/iproute2/Makefile
> +++ b/package/network/utils/iproute2/Makefile
> @@ -108,7 +108,7 @@ define Build/Configure
>  		$(PKG_BUILD_DIR)/Makefile
>  	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
>  		$(PKG_BUILD_DIR)/Makefile
> -	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
> +	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
>  		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
>  endef
>  
> diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
> index 79059e5..2a8d9dd 100644
> --- a/package/utils/busybox/Config-defaults.in
> +++ b/package/utils/busybox/Config-defaults.in
> @@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
>  config BUSYBOX_DEFAULT_NSLOOKUP
>  	bool
>  	default n
> -config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> +config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT

Need to adjust the patch file accordingly.

>  	bool
>  	default y
> -config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> +config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS

Dito.

>  	bool
>  	default n
>  config BUSYBOX_DEFAULT_NTPD
> diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
> index 14875d5..2d2a1c4 100644
> --- a/package/utils/busybox/config/networking/Config.in
> +++ b/package/utils/busybox/config/networking/Config.in
> @@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
>  	default BUSYBOX_DEFAULT_NSLOOKUP
>  	help
>  	  nslookup is a tool to query Internet name servers.
> -config BUSYBOX_CONFIG_NSLOOKUP_LEDE
> +config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT

Dito.

>  	bool "nslookup_lede"
>  	depends on !BUSYBOX_CONFIG_NSLOOKUP
> -	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> +	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT

Dito.

>  	help
> -	  nslookup is a tool to query Internet name servers (LEDE flavor).
> +	  nslookup is a tool to query Internet name servers (OpenWrt flavor).
>  
> -config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> +config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS

Dito.

>         bool "Enable long options"
> -       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> -       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
> +       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
> +       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
>         help
>           Support long options for the nslookup applet.
>  config BUSYBOX_CONFIG_NTPD

[...]
Piotr Dymacz Oct. 24, 2017, 1:35 p.m. | #3
Hello Zoltan, Hauke,

Just one, small comment, inline below.

On 24.10.2017 13:46, Zoltan HERPAI wrote:

[...]

> diff --git a/include/image-commands.mk b/include/image-commands.mk
> index aaece70..3507578 100644
> --- a/include/image-commands.mk
> +++ b/include/image-commands.mk
> @@ -7,7 +7,7 @@ define Build/uImage
>   	mkimage -A $(LINUX_KARCH) \
>   		-O linux -T kernel \
>   		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
> -		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
> +		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new

I think it would make sense to use VERSION_DIST(_SANITIZED) variable 
here (and in all similar places below) instead of hardcoded value.
Daniel Golle Oct. 24, 2017, 2:01 p.m. | #4
On Tue, Oct 24, 2017 at 03:07:04PM +0200, Jo-Philipp Wich wrote:
> Hi,
> 
> comments inline.
> 
> > Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
> 
> Given the fact that we explicitely wanted to avoid @openwrt.org mails
> and that this was one of the discussion points leading to the split I
> find it delicate to seal the merging commit with exactly such a S-o-b.
> 
> Combined with ...
> 
>   $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>   Tue, 18 Oct 2016 11:42:06 +0200
> 
> ... this looks to me like nothing was learned from past experiences and
> that all that matters here is having the own name attached to the work
> being done.

I agree. Despite the domain name being handed over it still looks like
the openwrt.org infrastructure is the hands of a single person, which
was the precise cause for the fork...
What about handing this AS over to the SPI as well? Or at least have
several admin-c registered?

(I'm aware that this might not be the best moment to discuss this, we
all could have thought about that a bit earlier...)

[daniel@box ~]$ host -t MX openwrt.org
openwrt.org mail is handled by 10 mail.openwrt.org.
[daniel@box ~]$ host mail.openwrt.org.
mail.openwrt.org has address 78.24.191.176
[daniel@box ~]$ whois 78.24.191.176
% This is the RIPE Database query service.
% The objects are in RPSL format.
%
% The RIPE Database is subject to Terms and Conditions.
% See http://www.ripe.net/db/support/db-terms-conditions.pdf

% Note: this output has been filtered.
%       To receive output for a database update, use the "-B" flag.

% Information related to '78.24.191.176 - 78.24.191.191'

% Abuse contact for '78.24.191.176 - 78.24.191.191' is 'abuse@atw.co.hu'

inetnum:        78.24.191.176 - 78.24.191.191
netname:        HU-ATW-OPENWRT
descr:          OpenWrt project
country:        HU
admin-c:        BIK4-RIPE
tech-c:         BIK4-RIPE
mnt-by:         MNT-ATW
status:         ASSIGNED PA
created:        2009-06-17T08:51:36Z
last-modified:  2009-06-17T08:51:36Z
source:         RIPE # Filtered

person:         Bertalan Imre Kaloz
address:        Berkocsis utca 18.
address:        H-1084 Budapest
address:        Hungary
phone:          +36 70 3136791
nic-hdl:        BIK4-RIPE
mnt-by:         MNT-ATW
created:        2009-06-17T08:51:36Z
last-modified:  2009-06-17T08:51:36Z
source:         RIPE

% Information related to '78.24.188.0/22AS41075'

route:          78.24.188.0/22
descr:          ATW Internet Kft.
descr:          Budapest, Hungary
origin:         AS41075
mnt-by:         MNT-ATW
created:        2014-12-03T11:50:32Z
last-modified:  2014-12-03T11:50:32Z
source:         RIPE # Filtered

% This query was served by the RIPE Database Query Service version 1.90 (ANGUS)
Hannu Nyman Oct. 24, 2017, 2:31 p.m. | #5
Zoltan HERPAI kirjoitti 24.10.2017 klo 14:46:
> 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.
>      
> ...
> --- 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
> + -----------------------------------------------------


Please do not re-introduce hard-coded version branding into various files.

All version info was centralised to include/version.mk by this commit:

https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68

and further refined with

https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68

Having hard-coded versions scattered around in various files proved to be 
cumbersome at several Openwrt releases, as some of the hard-coded names were 
forgotten to be changed in connection to several releases.

In LEDE sources the variables like "%N (%V, %C)" take nicely care of the 
version branding also in /etc/banner, also including the version name.

Using hard-coded name like "DESIGNATED DRIVER (%C, %R)" would be a clear step 
backwards.



Ps.

And are the drinks really back on the menu?
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <div class="moz-cite-prefix">Zoltan HERPAI kirjoitti 24.10.2017 klo
      14:46:<br>
    </div>
    <blockquote type="cite"
      cite="mid:%3C1508845578-30041-1-git-send-email-wigyori@uid0.hu%3E">
      <pre wrap="">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.
    
...</pre>
    </blockquote>
    <blockquote type="cite"
      cite="mid:%3C1508845578-30041-1-git-send-email-wigyori@uid0.hu%3E">
      <pre wrap="">--- 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
+ -----------------------------------------------------
</pre>
    </blockquote>
    <p><br>
    </p>
    <p>Please do not re-introduce hard-coded version branding into
      various files.</p>
    All version info was centralised to include/version.mk by this
    commit:
    <p><a class="moz-txt-link-freetext" href="https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68">https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68</a></p>
    <p>and further refined with</p>
    <p><a class="moz-txt-link-freetext" href="https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68">https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68</a><br>
    </p>
    <p>Having hard-coded versions scattered around in various files
      proved to be cumbersome at several Openwrt releases, as some of
      the hard-coded names were forgotten to be changed in connection to
      several releases.</p>
    In LEDE sources the variables like "%N (%V, %C)" take nicely care of
    the version branding also in /etc/banner, also including the version
    name. <br>
    <p>Using hard-coded name like "DESIGNATED DRIVER (%C, %R)" would be
      a clear step backwards.</p>
    <p><br>
    </p>
    <p><br>
    </p>
    <p>Ps.</p>
    <p>And are the drinks really back on the menu?</p>
    <p><br>
    </p>
  </body>
</html>
Zoltan HERPAI Oct. 24, 2017, 2:49 p.m. | #6
Hi Hannu,

On Tue, 24 Oct 2017, Hannu Nyman wrote:

> Zoltan HERPAI kirjoitti 24.10.2017 klo 14:46:
>> 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.
>>      ...
>
>> @@ -1,10 +1,13 @@
>> -   \  DE    \  /    %N (%V, %C)
>> + DESIGNATED DRIVER (%C, %R)
> Please do not re-introduce hard-coded version branding into various files.
>
> All version info was centralised to include/version.mk by this commit:
>
> https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68
>
> and further refined with
>
> https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68

Yep, this was pointed out by Jo as well, will change it.


> Ps.
>
> And are the drinks really back on the menu?

I think at least a vote was about to happen on this topic for the next 
release :)

-w-
Zoltan HERPAI Oct. 24, 2017, 2:59 p.m. | #7
Hi Jo,

On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:

> Hi,
>
> comments inline.
>
>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>
> Given the fact that we explicitely wanted to avoid @openwrt.org mails
> and that this was one of the discussion points leading to the split I
> find it delicate to seal the merging commit with exactly such a S-o-b.
>
> Combined with ...
>
>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>  Tue, 18 Oct 2016 11:42:06 +0200
>
> ... this looks to me like nothing was learned from past experiences and
> that all that matters here is having the own name attached to the work
> being done.

LEDE does have patches in the tree s-o-b-ed and accepted like this dated 
January '17. (f24ffb901e0408917748773b883841eca52eea05)

"*) email accounts
- currently there are around ~20 active openwrt.org mail accounts (the 3 owrt devs would like to keep theirs active)
- turn all the webmaster@, hostmaster@, ... accounts into aliases that anyone with voting rights can be subscribed to
- ask those people that are no longer active to voluntarily give up their accounts
- mail addresses may under no conditions be used for any personal business, consultancy, applying for jobs, ... purposes
- any mail sent from an openwrt.org account needs to adhere the trademark policy and should only be used for FOSS purposes"

In my view, this is FOSS purpose rather than anything else.


> Anyhow, on to the code.
>
>> diff --git a/Config.in b/Config.in
>> index ddbc4e2..d30c048 100644
>> --- a/Config.in
>> +++ b/Config.in
>
> [...]
>
>>  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.openwrt.org/snapshots)
>
> We need to setup the server first or delegate downloads.openwrt.org to
> downloads.lede-project.org or add a rewrite rule to redirect
> http://downloads.openwrt.org/snapshots/(.*) to
> http://downloads.lede-project.org/snapshots/$1 for now.

Agreed, there are dependencies on the infrastructure side for this to be 
merged - or I'm OK to back it out until it's done. Having said that, this 
is easier to crack compared to the $LEDE_GIT source entries in the 
packages.


>>  VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
>> -VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
>> +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
>
> Likewise.

Likewise.

>>  VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
>> -VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
>> +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)
>
> Undecided.

TBD.

>>  VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
>>  VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
>
> [...]
>
>> 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)
>
> Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
> r3560-79f57e422d) are more useful under the new version scheme than "%C,
> %R" (r3560-79f57e422d, r3560-79f57e422d)

Let's stash the "DESIGNATED DRIVER" until others reply. VERSION_NUMBER 
is currently SNAPSHOT - we should let others decide the cocktail part 
of it. :)


>> + -----------------------------------------------------
>> +  * 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
>> + -----------------------------------------------------
>> diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
>> index 8c5f677..54c0e3e 100755
>> --- a/package/base-files/files/etc/init.d/system
>> +++ b/package/base-files/files/etc/init.d/system
>> @@ -7,7 +7,7 @@ USE_PROCD=1
>>  validate_system_section()
>>  {
>>  	uci_validate_section system system "${1}" \
>> -		'hostname:string:lede' \
>> +		'hostname:string:openwrt' \
>
> While we're at it we should properly capitalize the default to "OpenWrt".

Sure, this was to follow the "lede" capitalization, happy to change.


>>  		'conloglevel:uinteger' \
>>  		'buffersize:uinteger' \
>>  		'timezone:string:UTC' \
>
> [...]
>
>> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
>> index 6b8be1c..fd8365a 100755
>> --- a/package/network/services/uhttpd/files/uhttpd.init
>> +++ b/package/network/services/uhttpd/files/uhttpd.init
>> @@ -52,7 +52,7 @@ generate_keys() {
>>  	[ -n "$GENKEY_CMD" ] && {
>>  		$GENKEY_CMD \
>>  			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
>> -			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
>> +			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
>
> Maybe we should adjust the defaults here to match the shipped config.
>
>>  		sync
>>  		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
>>  		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
>> diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
>> index 14a33c5..c9ef626 100644
>> --- a/package/network/utils/iproute2/Makefile
>> +++ b/package/network/utils/iproute2/Makefile
>> @@ -108,7 +108,7 @@ define Build/Configure
>>  		$(PKG_BUILD_DIR)/Makefile
>>  	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
>>  		$(PKG_BUILD_DIR)/Makefile
>> -	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
>> +	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
>>  	> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
>>  endef
>>
>> diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
>> index 79059e5..2a8d9dd 100644
>> --- a/package/utils/busybox/Config-defaults.in
>> +++ b/package/utils/busybox/Config-defaults.in
>> @@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
>>  config BUSYBOX_DEFAULT_NSLOOKUP
>>  	bool
>>  	default n
>> -config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
>> +config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
>
> Need to adjust the patch file accordingly.

Ack for all below, will do.


>>  	bool
>>  	default y
>> -config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> +config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>
> Dito.
>
>>  	bool
>>  	default n
>>  config BUSYBOX_DEFAULT_NTPD
>> diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
>> index 14875d5..2d2a1c4 100644
>> --- a/package/utils/busybox/config/networking/Config.in
>> +++ b/package/utils/busybox/config/networking/Config.in
>> @@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
>>  	default BUSYBOX_DEFAULT_NSLOOKUP
>>  	help
>>  	  nslookup is a tool to query Internet name servers.
>> -config BUSYBOX_CONFIG_NSLOOKUP_LEDE
>> +config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
>
> Dito.
>
>>  	bool "nslookup_lede"
>>  	depends on !BUSYBOX_CONFIG_NSLOOKUP
>> -	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
>> +	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
>
> Dito.
>
>>  	help
>> -	  nslookup is a tool to query Internet name servers (LEDE flavor).
>> +	  nslookup is a tool to query Internet name servers (OpenWrt flavor).
>>
>> -config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> +config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>
> Dito.
>
>>         bool "Enable long options"
>> -       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> -       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
>> +       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>> +       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
>>         help
>>           Support long options for the nslookup applet.
>>  config BUSYBOX_CONFIG_NTPD
>
> [...]
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
>
Mathias Kresin Oct. 24, 2017, 5:17 p.m. | #8
2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
> Hi Jo,
>
> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>
>> Hi,
>>
>> comments inline.
>>
>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>
>>
>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>> and that this was one of the discussion points leading to the split I
>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>
>> Combined with ...
>>
>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>  Tue, 18 Oct 2016 11:42:06 +0200
>>
>> ... this looks to me like nothing was learned from past experiences and
>> that all that matters here is having the own name attached to the work
>> being done.
>
>
> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>
> "*) email accounts
> - currently there are around ~20 active openwrt.org mail accounts (the 3
> owrt devs would like to keep theirs active)
> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
> anyone with voting rights can be subscribed to
> - ask those people that are no longer active to voluntarily give up their
> accounts
> - mail addresses may under no conditions be used for any personal business,
> consultancy, applying for jobs, ... purposes
> - any mail sent from an openwrt.org account needs to adhere the trademark
> policy and should only be used for FOSS purposes"
>
> In my view, this is FOSS purpose rather than anything else.

Can't we just find some kind of gentleman/ladies agreement to not use
the mail addresses in public? I mean, I never got why these three
people insists on using their mail addresses for anything other than
receiving mail/as a forwarder.

As soon as someone starts to use a @openwrt.org mail address,
basically all other are forced to do so as well. Otherwise the way it
comes across is N @openwrt.org core devs + X people committing as
well. Which I'm quite sure is what nobody wants to see.

my two cents
Mathias
Hans Dedecker Oct. 24, 2017, 7:47 p.m. | #9
On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>> Hi Jo,
>>
>> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>>
>>> Hi,
>>>
>>> comments inline.
>>>
>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>
>>>
>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>> and that this was one of the discussion points leading to the split I
>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>
>>> Combined with ...
>>>
>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>
>>> ... this looks to me like nothing was learned from past experiences and
>>> that all that matters here is having the own name attached to the work
>>> being done.
>>
>>
>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>
>> "*) email accounts
>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>> owrt devs would like to keep theirs active)
>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>> anyone with voting rights can be subscribed to
>> - ask those people that are no longer active to voluntarily give up their
>> accounts
>> - mail addresses may under no conditions be used for any personal business,
>> consultancy, applying for jobs, ... purposes
>> - any mail sent from an openwrt.org account needs to adhere the trademark
>> policy and should only be used for FOSS purposes"
>>
>> In my view, this is FOSS purpose rather than anything else.
>
> Can't we just find some kind of gentleman/ladies agreement to not use
> the mail addresses in public? I mean, I never got why these three
> people insists on using their mail addresses for anything other than
> receiving mail/as a forwarder.
>
> As soon as someone starts to use a @openwrt.org mail address,
> basically all other are forced to do so as well. Otherwise the way it
> comes across is N @openwrt.org core devs + X people committing as
> well. Which I'm quite sure is what nobody wants to see.
>
> my two cents
> Mathias
I agree with Mathias can't we find a better consensus on the usage of
the openwrt mail address ?
Now it looks like 3 people officially represent the project next to
the other developers; this will only cause friction in the future.

Hans

> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Hauke Mehrtens Oct. 24, 2017, 9:45 p.m. | #10
On 10/24/2017 09:47 PM, Hans Dedecker wrote:
> On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
>> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>>> Hi Jo,
>>>
>>> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>>>
>>>> Hi,
>>>>
>>>> comments inline.
>>>>
>>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>>
>>>>
>>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>>> and that this was one of the discussion points leading to the split I
>>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>>
>>>> Combined with ...
>>>>
>>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>>
>>>> ... this looks to me like nothing was learned from past experiences and
>>>> that all that matters here is having the own name attached to the work
>>>> being done.
>>>
>>>
>>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>>
>>> "*) email accounts
>>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>>> owrt devs would like to keep theirs active)
>>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>>> anyone with voting rights can be subscribed to
>>> - ask those people that are no longer active to voluntarily give up their
>>> accounts
>>> - mail addresses may under no conditions be used for any personal business,
>>> consultancy, applying for jobs, ... purposes
>>> - any mail sent from an openwrt.org account needs to adhere the trademark
>>> policy and should only be used for FOSS purposes"
>>>
>>> In my view, this is FOSS purpose rather than anything else.
>>
>> Can't we just find some kind of gentleman/ladies agreement to not use
>> the mail addresses in public? I mean, I never got why these three
>> people insists on using their mail addresses for anything other than
>> receiving mail/as a forwarder.
>>
>> As soon as someone starts to use a @openwrt.org mail address,
>> basically all other are forced to do so as well. Otherwise the way it
>> comes across is N @openwrt.org core devs + X people committing as
>> well. Which I'm quite sure is what nobody wants to see.
>>
>> my two cents
>> Mathias
> I agree with Mathias can't we find a better consensus on the usage of
> the openwrt mail address ?
> Now it looks like 3 people officially represent the project next to
> the other developers; this will only cause friction in the future.
> 
> Hans

I agree with Mathias and Hans, I also do not like this and this looks
like some are more equal than others to outsiders.

I have no problem when the mails are getting forward to the old user of
the address, so that people who send a mail to some @openwrt.org address
still reach the correct person, this can also stay activate forever when
someone wants to maintain the service. The @openwrt.org addresses should
not be used in communication, especially when it is related to OpenWrt,
this includes S-o-b lines, copyright lines and outgoing communication.

Hauke
Zoltan HERPAI Oct. 24, 2017, 10:21 p.m. | #11
Hi Hauke,

On Tue, 24 Oct 2017, Hauke Mehrtens wrote:

> On 10/24/2017 09:47 PM, Hans Dedecker wrote:
>> On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
>>> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>>>>>
>>>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>>>
>>>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>>>> and that this was one of the discussion points leading to the split I
>>>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>>>
>>>>> Combined with ...
>>>>>
>>>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>>>
>>>>> ... this looks to me like nothing was learned from past experiences and
>>>>> that all that matters here is having the own name attached to the work
>>>>> being done.
>>>>
>>>>
>>>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>>>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>>>
>>>> "*) email accounts
>>>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>>>> owrt devs would like to keep theirs active)
>>>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>>>> anyone with voting rights can be subscribed to
>>>> - ask those people that are no longer active to voluntarily give up their
>>>> accounts
>>>> - mail addresses may under no conditions be used for any personal business,
>>>> consultancy, applying for jobs, ... purposes
>>>> - any mail sent from an openwrt.org account needs to adhere the trademark
>>>> policy and should only be used for FOSS purposes"
>>>>
>>>> In my view, this is FOSS purpose rather than anything else.
>>>
>>> Can't we just find some kind of gentleman/ladies agreement to not use
>>> the mail addresses in public? I mean, I never got why these three
>>> people insists on using their mail addresses for anything other than
>>> receiving mail/as a forwarder.
>>>
>>> As soon as someone starts to use a @openwrt.org mail address,
>>> basically all other are forced to do so as well. Otherwise the way it
>>> comes across is N @openwrt.org core devs + X people committing as
>>> well. Which I'm quite sure is what nobody wants to see.
>>>
>>> my two cents
>>> Mathias
>> I agree with Mathias can't we find a better consensus on the usage of
>> the openwrt mail address ?
>> Now it looks like 3 people officially represent the project next to
>> the other developers; this will only cause friction in the future.
>>
>> Hans
>
> I agree with Mathias and Hans, I also do not like this and this looks
> like some are more equal than others to outsiders.
>
> I have no problem when the mails are getting forward to the old user of
> the address, so that people who send a mail to some @openwrt.org address
> still reach the correct person, this can also stay activate forever when
> someone wants to maintain the service. The @openwrt.org addresses should
> not be used in communication, especially when it is related to OpenWrt,
> this includes S-o-b lines, copyright lines and outgoing communication.

Getting a consensus is one thing, arguing against what was voted on is 
another. I don't think that anyone wants to misrepresent the project or 
cause friction of any kind - such behaviour would be beyond 
professionalism, and these things were discussed in detail in the remerge 
proposals -, especially when the Reboot has achieved a lot of things, and 
we should look into the future.

Having said all that, currently I can only create a v2 of this patch with 
the fixes asked/proposed.

Regards,
-w-
Karl Palsson Oct. 25, 2017, 10:41 a.m. | #12
Zoltan HERPAI <wigyori@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.
>     


I'd like to leave Designated Driver as the period of time for
OpenWrt's trunk branch before LEDE, and have "something
different" for the new path going forward. The YY.MM naming is
boring, but functional. Alphabetical names are fine too, but I
don't think it should go back to the old name.

Sincerely,
Karl P

Patch

diff --git a/Config.in b/Config.in
index ddbc4e2..d30c048 100644
--- a/Config.in
+++ b/Config.in
@@ -4,7 +4,7 @@ 
 # See /LICENSE for more information.
 #
 
-mainmenu "LEDE Configuration"
+mainmenu "OpenWrt Configuration"
 
 config MODULES
 	option modules
diff --git a/Makefile b/Makefile
index 09db75c..0a1f96a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@  export TOPDIR LC_ALL LANG TZ
 
 empty:=
 space:= $(empty) $(empty)
-$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces))
+$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces))
 
 world:
 
diff --git a/README b/README
index 405c18b..864ea2f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@ 
-This is the buildsystem for the LEDE Linux distribution.
+This is the buildsystem for the OpenWrt Linux distribution.
 
 Please use "make menuconfig" to choose your preferred
 configuration for the toolchain and firmware.
@@ -23,7 +23,7 @@  the lack of case sensitiveness in the file system.
 
 
 Sunshine!
-	Your LEDE Community
-	http://www.lede-project.org
+	Your OpenWrt Community
+	http://www.openwrt.org
 
 
diff --git a/include/image-commands.mk b/include/image-commands.mk
index aaece70..3507578 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -7,7 +7,7 @@  define Build/uImage
 	mkimage -A $(LINUX_KARCH) \
 		-O linux -T kernel \
 		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
+		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new
 	mv $@.new $@
 endef
 
@@ -60,7 +60,7 @@  endef
 
 define Build/netgear-dni
 	$(STAGING_DIR_HOST)/bin/mkdniimg \
-		-B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \
+		-B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \
 		$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
 		-r "$(1)" \
 		-i $@ -o $@.new
@@ -83,7 +83,7 @@  define Build/append-uImage-fakeroot-hdr
 	rm -f $@.fakeroot
 	$(STAGING_DIR_HOST)/bin/mkimage \
 		-A $(LINUX_KARCH) -O linux -T filesystem -C none \
-		-n '$(call toupper,$(LINUX_KARCH)) LEDE fakeroot' \
+		-n '$(call toupper,$(LINUX_KARCH)) OpenWrt fakeroot' \
 		-s \
 		$@.fakeroot
 	cat $@.fakeroot >> $@
diff --git a/include/image.mk b/include/image.mk
index 3f5b454..eccf943 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -136,7 +136,7 @@  endef
 
 define Image/BuildKernel/MkuImage
 	mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-		-n '$(call toupper,$(ARCH)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5)
+		-n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
 endef
 
 define Image/BuildKernel/MkFIT
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7d96921..0fab326 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -18,7 +18,7 @@  $(eval $(call TestHostCommand,working-make, \
 	$(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)'))
 
 $(eval $(call TestHostCommand,case-sensitive-fs, \
-	LEDE can only be built on a case-sensitive filesystem, \
+	OpenWrt can only be built on a case-sensitive filesystem, \
 	rm -f $(TMP_DIR)/test.*; touch $(TMP_DIR)/test.fs; \
 		test ! -f $(TMP_DIR)/test.FS))
 
diff --git a/include/version.mk b/include/version.mk
index 1a0d3c9..4a8ac0b 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -40,23 +40,23 @@  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_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.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/)
+VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://openwrt.org/)
 
 VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
-VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
+VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
 
 VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
-VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
+VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)
 
 VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
 VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 216e457..a5511c4 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -34,7 +34,7 @@  define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
   DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
-  TITLE:=Base filesystem for Lede
+  TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
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.@system[0]
 		add system system
-		set system.@system[-1].hostname='LEDE'
+		set system.@system[-1].hostname='OpenWrt'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@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
+ -----------------------------------------------------
diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index 8c5f677..54c0e3e 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -7,7 +7,7 @@  USE_PROCD=1
 validate_system_section()
 {
 	uci_validate_section system system "${1}" \
-		'hostname:string:lede' \
+		'hostname:string:openwrt' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
 		'timezone:string:UTC' \
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 5442a74..c3ec7bf 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -113,7 +113,7 @@  preinit_ip() {
 		preinit_config_board
 	fi
 
-	preinit_net_echo "Doing Lede Preinit\n"
+	preinit_net_echo "Doing OpenWrt Preinit\n"
 }
 
 preinit_ip_deconfig() {
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 87d2ac6..824427b 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -158,7 +158,7 @@  if VERSIONOPT
 	config VERSION_DIST
 		string
 		prompt "Release distribution"
-		default "LEDE"
+		default "OpenWrt"
 		help
 			This is the name of the release distribution.
 			If unspecified, it defaults to OpenWrt.
@@ -190,7 +190,7 @@  if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "http://downloads.lede-project.org/snapshots"
+		default "http://downloads.openwrt.org/snapshots"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -201,13 +201,13 @@  if VERSIONOPT
 			 %c .. Configured release revision code or value of %R, lowercase
 			 %N .. Release name, uppercase
 			 %n .. Release name, lowercase
-			 %D .. Distribution name or "Lede", uppercase
-			 %d .. Distribution name or "lede", lowercase
+			 %D .. Distribution name or "OpenWrt", uppercase
+			 %d .. Distribution name or "openwrt", lowercase
 			 %T .. Target name
 			 %S .. Target/Subtarget name
 			 %A .. Package architecture
 			 %t .. Build taint flags, e.g. "no-all busybox"
-			 %M .. Manufacturer name or "Lede"
+			 %M .. Manufacturer name or "OpenWrt"
 			 %P .. Product name or "Generic"
 			 %h .. Hardware revision or "v0"
 
diff --git a/package/boot/uboot-layerscape-armv8_32b/Makefile b/package/boot/uboot-layerscape-armv8_32b/Makefile
index d204a30..d221e7d 100644
--- a/package/boot/uboot-layerscape-armv8_32b/Makefile
+++ b/package/boot/uboot-layerscape-armv8_32b/Makefile
@@ -12,7 +12,7 @@  PKG_VERSION:=2017.09
 PKG_RELEASE:=1
 
 # Layerscape ARMv8 platforms use 64-bit u-boot to support both 32-bit and 64-bit
-# kernel/rootfs. Since LEDE could only provide 32-bit toolchain for 32-bit targets,
+# kernel/rootfs. Since OpenWrt could only provide 32-bit toolchain for 32-bit targets,
 # 64-bit u-boot images git tree is provided here whose source code actually is
 # uboot-layerscape's source code.
 PKG_SOURCE_PROTO:=git
diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
index 2780fa1..3643f6b 100644
--- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -469,7 +469,7 @@  detect_broadcom() {
 			set wireless.default_wl${i}.device=wl${i}
 			set wireless.default_wl${i}.network=lan
 			set wireless.default_wl${i}.mode=ap
-			set wireless.default_wl${i}.ssid=Lede${i#0}
+			set wireless.default_wl${i}.ssid=OpenWrt${i#0}
 			set wireless.default_wl${i}.encryption=none
 EOF
 		uci -q commit wireless
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 940fb52..3540777 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -122,7 +122,7 @@  detect_mac80211() {
 			set wireless.default_radio${devidx}.device=radio${devidx}
 			set wireless.default_radio${devidx}.network=lan
 			set wireless.default_radio${devidx}.mode=ap
-			set wireless.default_radio${devidx}.ssid=LEDE
+			set wireless.default_radio${devidx}.ssid=OpenWrt
 			set wireless.default_radio${devidx}.encryption=none
 EOF
 		uci -q commit wireless
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 16925d5..6b2d733 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -356,8 +356,8 @@  hostapd_set_bss_options() {
 	[ -n "$wps_possible" -a -n "$config_methods" ] && {
 		set_default ext_registrar 0
 		set_default wps_device_type "6-0050F204-1"
-		set_default wps_device_name "Lede AP"
-		set_default wps_manufacturer "www.lede-project.org"
+		set_default wps_device_name "OpenWrt AP"
+		set_default wps_manufacturer "www.openwrt.org"
 		set_default wps_independent 1
 
 		wps_state=2
diff --git a/package/network/services/lldpd/files/lldpd.config b/package/network/services/lldpd/files/lldpd.config
index d2b3d15..36b43c8 100644
--- a/package/network/services/lldpd/files/lldpd.config
+++ b/package/network/services/lldpd/files/lldpd.config
@@ -10,7 +10,7 @@  config lldpd config
 	option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"
 
 	# if empty, the distribution description is sent
-	#option lldp_description "Lede System"
+	#option lldp_description "OpenWrt System"
 
 	# interfaces to listen on
 	list interface "loopback"
diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 39bce98..c3d9ba0 100644
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -16,7 +16,7 @@  find_release_info()
 	[ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
 		PRETTY_NAME="$(cat /etc/openwrt_version)"
 
-	echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
+	echo "${PRETTY_NAME:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
 }
 
 write_lldpd_conf()
diff --git a/package/network/services/samba36/files/samba.config b/package/network/services/samba36/files/samba.config
index b34a8dc..c79db0d 100644
--- a/package/network/services/samba36/files/samba.config
+++ b/package/network/services/samba36/files/samba.config
@@ -1,6 +1,6 @@ 
 config samba
-	option 'name'			'Lede'
+	option 'name'			'OpenWrt'
 	option 'workgroup'		'WORKGROUP'
-	option 'description'		'Lede'
+	option 'description'		'OpenWrt'
 	option 'homes'			'1'
 
diff --git a/package/network/services/samba36/files/samba.init b/package/network/services/samba36/files/samba.init
index 28b0064..ae0e0e2 100755
--- a/package/network/services/samba36/files/samba.init
+++ b/package/network/services/samba36/files/samba.init
@@ -23,9 +23,9 @@  smb_header() {
 	local name workgroup description charset
 	local hostname="$(uci_get system.@system[0].hostname)"
 
-	config_get name        $1 name        "${hostname:-Lede}"
-	config_get workgroup   $1 workgroup   "${hostname:-Lede}"
-	config_get description $1 description "Samba on ${hostname:-Lede}"
+	config_get name        $1 name        "${hostname:-OpenWrt}"
+	config_get workgroup   $1 workgroup   "${hostname:-OpenWrt}"
+	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 	config_get charset     $1 charset     "UTF-8"
 
 	mkdir -p /var/etc
diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index 563c079..a7d769e 100644
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -83,7 +83,7 @@  config uhttpd main
 	option tcp_keepalive	1
 
 	# Basic auth realm, defaults to local hostname
-#	option realm	Lede
+#	option realm	OpenWrt
 
 	# Configuration file in busybox httpd format
 #	option config	/etc/httpd.conf
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 6b8be1c..fd8365a 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -52,7 +52,7 @@  generate_keys() {
 	[ -n "$GENKEY_CMD" ] && {
 		$GENKEY_CMD \
 			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
+			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
 		sync
 		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
 		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 14a33c5..c9ef626 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -108,7 +108,7 @@  define Build/Configure
 		$(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
 		$(PKG_BUILD_DIR)/Makefile
-	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
+	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
 		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
 endef
 
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 79059e5..2a8d9dd 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -2332,10 +2332,10 @@  config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
 config BUSYBOX_DEFAULT_NSLOOKUP
 	bool
 	default n
-config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
+config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
 	bool
 	default n
 config BUSYBOX_DEFAULT_NTPD
diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index 14875d5..2d2a1c4 100644
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -700,17 +700,17 @@  config BUSYBOX_CONFIG_NSLOOKUP
 	default BUSYBOX_DEFAULT_NSLOOKUP
 	help
 	  nslookup is a tool to query Internet name servers.
-config BUSYBOX_CONFIG_NSLOOKUP_LEDE
+config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
 	bool "nslookup_lede"
 	depends on !BUSYBOX_CONFIG_NSLOOKUP
-	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
+	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
 	help
-	  nslookup is a tool to query Internet name servers (LEDE flavor).
+	  nslookup is a tool to query Internet name servers (OpenWrt flavor).
 
-config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
        bool "Enable long options"
-       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
-       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
+       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
        help
          Support long options for the nslookup applet.
 config BUSYBOX_CONFIG_NTPD
diff --git a/package/utils/ct-bugcheck/src/bugcheck.sh b/package/utils/ct-bugcheck/src/bugcheck.sh
index 85f70c5..64e96b6 100755
--- a/package/utils/ct-bugcheck/src/bugcheck.sh
+++ b/package/utils/ct-bugcheck/src/bugcheck.sh
@@ -11,7 +11,7 @@  FOUND_BUG=0
 
 bugcheck_generic()
 {
-    echo "LEDE crashlog report" > $CRASHDIR/info.txt
+    echo "OpenWrt crashlog report" > $CRASHDIR/info.txt
     date >> $CRASHDIR/info.txt
     echo >> $CRASHDIR/info.txt
     echo "uname" >> $CRASHDIR/info.txt
@@ -89,7 +89,7 @@  do
 	  echo "https://github.com/greearb/ath10k-ct/issues" >> $CRASHDIR/report_to.txt
       else
 	  # Not sure who would want these bug reports for upstream...
-	  echo "https://www.lede-project.org/" >> $CRASHDIR/report_to.txt
+	  echo "https://www.openwrt.org/" >> $CRASHDIR/report_to.txt
       fi
       echo >> $CRASHDIR/report_to.txt
       echo "Please attach all files in this directory to bug reports." >> $CRASHDIR/report_to.txt
diff --git a/scripts/brcmImage.pl b/scripts/brcmImage.pl
index aab86d6..60a59f2 100755
--- a/scripts/brcmImage.pl
+++ b/scripts/brcmImage.pl
@@ -33,7 +33,7 @@  use Compress::Zlib;
 my $version = "0.1";
 my %arg = (
 	o => 'bcm963xx_fs_kernel',
-	b => 'LEDE',
+	b => 'OpenWrt',
 	c => '6348',
 	s => 64,
 	f => 0xbfc00000,
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 05fd772..5224ea4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -174,7 +174,7 @@  if ($tree) {
 	}
 
 	if (!defined $root) {
-		print "Must be run from the top-level dir. of a LEDE tree\n";
+		print "Must be run from the top-level dir. of a OpenWrt tree\n";
 		exit(2);
 	}
 }
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c
index c366e21..540fa91 100644
--- a/scripts/config/mconf.c
+++ b/scripts/config/mconf.c
@@ -25,7 +25,7 @@ 
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some LEDE features may be built directly into the image.\n"
+"Some OpenWrt features may be built directly into the image.\n"
 "Some may be made into installable ipkg packages. Some features\n"
 "may be completely removed altogether.\n"
 "\n"
diff --git a/scripts/qemustart b/scripts/qemustart
index 5cadd7d..6c2254e 100755
--- a/scripts/qemustart
+++ b/scripts/qemustart
@@ -107,8 +107,8 @@  Examples
   $SELF malta le64
   $SELF malta be-glibc
   $SELF armvirt 32 \\
-                --kernel bin/targets/armvirt/32/lede-armvirt-32-zImage \\
-                --rootfs bin/targets/armvirt/32/lede-armvirt-32-root.ext4
+                --kernel bin/targets/armvirt/32/openwrt-armvirt-32-zImage \\
+                --rootfs bin/targets/armvirt/32/openwrt-armvirt-32-root.ext4
 EOF
 }
 
@@ -158,12 +158,12 @@  start_qemu_armvirt() {
 		32)
 			qemu_exe="qemu-system-arm"
 			cpu="cortex-a15"
-			[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-zImage-initramfs"
+			[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-zImage-initramfs"
 			;;
 		64)
 			qemu_exe="qemu-system-aarch64"
 			cpu="cortex-a57"
-			[ -n "$kernel" ] || kernel="$o_bindir/lede-$o_target-${o_subtarget%-*}-Image-initramfs"
+			[ -n "$kernel" ] || kernel="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-Image-initramfs"
 			;;
 		*)
 			__errmsg "target $o_target: unknown subtarget $o_subtarget"
@@ -199,7 +199,7 @@  start_qemu_malta() {
 	[ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
 	qemu_exe="qemu-system-mips$is64$isel"
 
-	[ -n "$kernel" ] || kernel="$o_bindir/lede-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
+	[ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
 
 	# NOTE: order of wan, lan -device arguments matters as it will affect which
 	# one will be actually used as the wan, lan network interface inside the
@@ -216,7 +216,7 @@  start_qemu_x86() {
 	local qemu_exe
 
 	[ -n "$rootfs" ] || {
-		rootfs="$o_bindir/lede-$o_target-${o_subtarget%-*}-combined-ext4.img"
+		rootfs="$o_bindir/openwrt-$o_target-${o_subtarget%-*}-combined-ext4.img"
 		if [ ! -f "$rootfs" -a -s "$rootfs.gz" ]; then
 			gunzip "$rootfs.gz"
 		fi
diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index 49bb741..c1a5212 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,5 +1,5 @@ 
 config IB
-	bool "Build the LEDE Image Builder"
+	bool "Build the OpenWrt Image Builder"
 	depends on !EXTERNAL_TOOLCHAIN
 	default BUILDBOT
 	help
diff --git a/target/imagebuilder/files/repositories.conf b/target/imagebuilder/files/repositories.conf
index 93ed97b..8f1f27f 100644
--- a/target/imagebuilder/files/repositories.conf
+++ b/target/imagebuilder/files/repositories.conf
@@ -1,4 +1,4 @@ 
 ## Place your custom repositories here, they must match the architecture and version.
 # src/gz %n %U
-# src custom file:///usr/src/lede/bin/%T/packages
+# src custom file:///usr/src/openwrt/bin/%T/packages
 
diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 6ed183c..ee85292 100644
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -116,7 +116,7 @@  define Build/create-uImage-dtb
 	# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
 	-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
 		-O linux -T kernel -C none \
-		-n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' \
+		-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' \
 		-d $(IMAGE_KERNEL).dtb $@.new
 	@mv $@.new $@
 endef
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 3c5fcc3..06538c3 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -12,7 +12,7 @@  define Build/mkwrggimg
 	$(STAGING_DIR_HOST)/bin/mkwrggimg -b \
 		-i $@ -o $@.imghdr -d /dev/mtdblock/1 \
 		-m $(BOARDNAME) -s $(DAP_SIGNATURE) \
-		-v LEDE -B $(REVISION)
+		-v OpenWrt -B $(REVISION)
 	mv $@.imghdr $@
 endef
 
@@ -66,7 +66,7 @@  define Build/uImageHiWiFi
 	mkimage -A $(LINUX_KARCH) \
 		-O linux -T kernel \
 		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n 'tw150v1 $(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
+		-n 'tw150v1 $(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
 	@mv $@.new $@
 endef
 
diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk
index 701116b..01d7e50 100644
--- a/target/linux/ar71xx/image/legacy.mk
+++ b/target/linux/ar71xx/image/legacy.mk
@@ -485,11 +485,11 @@  define Image/Build/Belkin
 	$(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
 	$(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize))
 	if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-		edimax_fw_header -m $(5) -v "$(shell echo -n LEDE$(REVISION) | cut -c -13)" \
+		edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \
 			-n "uImage" \
 			-i $(KDIR_TMP)/vmlinux-$(2).uImage \
 			-o $(KDIR_TMP)/$(2)-uImage; \
-		edimax_fw_header -m $(5) -v "$(shell echo -n LEDE$(REVISION) | cut -c -13)" \
+		edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \
 			-n "rootfs" \
 			-i $(KDIR)/root.$(1) \
 			-o $(KDIR_TMP)/$(2)-rootfs; \
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
index 868bbda..63e75e5 100644
--- a/target/linux/ar71xx/image/tp-link.mk
+++ b/target/linux/ar71xx/image/tp-link.mk
@@ -39,7 +39,7 @@  define Build/uImageArcher
 	mkimage -A $(LINUX_KARCH) \
 		-O linux -T kernel \
 		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
+		-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new
 	@mv $@.new $@
 endef
 
diff --git a/target/linux/armvirt/README b/target/linux/armvirt/README
index fba71a6..ae0d2ad 100644
--- a/target/linux/armvirt/README
+++ b/target/linux/armvirt/README
@@ -4,18 +4,18 @@  QEMU ARM virt machine.
 Run with qemu-system-arm
 
 	# boot with initramfs embedded in
-	qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage-initramfs
+	qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage-initramfs
 
 	# boot with accel=kvm
 	qemu-system-arm -nographic -M virt,accel=kvm -cpu host -m 64 -kernel
-	lede-armvirt-32-zImage-initramfs
+	openwrt-armvirt-32-zImage-initramfs
 
 	# boot with a separate rootfs
-	qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage \
-	  -drive file=lede-armvirt-32-root.ext4,format=raw,if=virtio -append 'root=/dev/vda rootwait'
+	qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage \
+	  -drive file=openwrt-armvirt-32-root.ext4,format=raw,if=virtio -append 'root=/dev/vda rootwait'
 
 	# boot with local dir as rootfs
-	qemu-system-arm -nographic -M virt -m 64 -kernel lede-armvirt-32-zImage \
+	qemu-system-arm -nographic -M virt -m 64 -kernel openwrt-armvirt-32-zImage \
 	  -fsdev local,id=rootdev,path=root-armvirt/,security_model=none \
 	  -device virtio-9p-pci,fsdev=rootdev,mount_tag=/dev/root \
 	  -append 'rootflags=trans=virtio,version=9p2000.L,cache=loose rootfstype=9p'
@@ -23,10 +23,10 @@  Run with qemu-system-arm
 Run with kvmtool
 
 	# start a named machine
-	lkvm run -k lede-armvirt-32-zImage -i lede-armvirt-32-rootfs.cpio --name armvirt0
+	lkvm run -k openwrt-armvirt-32-zImage -i openwrt-armvirt-32-rootfs.cpio --name armvirt0
 
 	# start with virtio-9p rootfs
-	lkvm run -k lede-armvirt-32-zImage -d root-armvirt/
+	lkvm run -k openwrt-armvirt-32-zImage -d root-armvirt/
 
 	# stop "armvirt0"
 	lkvm stop --name armvirt0
@@ -37,4 +37,4 @@  Run with kvmtool
 The multi-platform ARMv8 target can be used with QEMU:
 
 	qemu-system-aarch64 -machine virt -cpu cortex-a57 -nographic \
-		-kernel lede-armvirt-64-Image-initramfs \
+		-kernel openwrt-armvirt-64-Image-initramfs \
diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
index 6ad15a2..4e90eb0 100644
--- a/target/linux/brcm63xx/image/bcm63xx.mk
+++ b/target/linux/brcm63xx/image/bcm63xx.mk
@@ -978,7 +978,7 @@  define Device/NEUFBOX4-SER
   DEVICE_DTS := nb4-ser-r0
   CFE_BOARD_ID := 96358VW
   CFE_CHIP_ID := 6358
-  CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
+  CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
   DEVICE_PACKAGES := \
     $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -990,7 +990,7 @@  define Device/NEUFBOX4-FXC
   DEVICE_DTS := nb4-fxc-r1
   CFE_BOARD_ID := 96358VW
   CFE_CHIP_ID := 6358
-  CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
+  CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
   DEVICE_PACKAGES := \
     $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
@@ -1002,7 +1002,7 @@  define Device/NEUFBOX6
   DEVICE_DTS := nb6-ser-r0
   CFE_BOARD_ID := NB6-SER-r0
   CFE_CHIP_ID := 6362
-  CFE_EXTRAS += --rsa-signature "LEDE-$(firstword $(subst -,$(space),$(REVISION)))"
+  CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))"
   DEVICE_PACKAGES := \
     $(B43_PACKAGES) $(USB2_PACKAGES)
 endef
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 9326c62..f6795ee 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -39,7 +39,7 @@  endef
 
 define Build/fullimage
 	mkimage -A mips -O linux -C lzma -T filesystem -a 0x00  \
-		-e 0x00 -n 'LEDE RootFS' \
+		-e 0x00 -n 'OpenWrt RootFS' \
 		-d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new
 
 	cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp
diff --git a/target/linux/mcs814x/image/Makefile b/target/linux/mcs814x/image/Makefile
index 7be7f8c..3afd660 100644
--- a/target/linux/mcs814x/image/Makefile
+++ b/target/linux/mcs814x/image/Makefile
@@ -20,7 +20,7 @@  UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 
 define Image/Build/MkuImage
 	mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \
-	-n 'ARM LEDE Linux-$(LINUX_VERSION)' -d $(1) $(2);
+	-n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2);
 endef
 
 define Image/Build/DTB
diff --git a/target/linux/mvebu/image/cfbase-boot.script b/target/linux/mvebu/image/cfbase-boot.script
index 5f9bcd7..89fa1dc 100644
--- a/target/linux/mvebu/image/cfbase-boot.script
+++ b/target/linux/mvebu/image/cfbase-boot.script
@@ -9,8 +9,8 @@  setenv fdtfile armada-388-clearfog-base.dtb
 
 # generate bootargs for rootfs on MMC
 if test "${devtype}" = "mmc"; then
-	setexpr lede_rootpart ${distro_bootpart} + 1
-	setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait
+	setexpr openwrt_rootpart ${distro_bootpart} + 1
+	setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
 fi
 
 # here one could add logic for other rootfs device types such as scsi and usb
diff --git a/target/linux/mvebu/image/cfpro-boot.script b/target/linux/mvebu/image/cfpro-boot.script
index e1523f8..1588c15 100644
--- a/target/linux/mvebu/image/cfpro-boot.script
+++ b/target/linux/mvebu/image/cfpro-boot.script
@@ -5,8 +5,8 @@ 
 
 # generate bootargs for rootfs on MMC
 if test "${devtype}" = "mmc"; then
-	setexpr lede_rootpart ${distro_bootpart} + 1
-	setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${lede_rootpart} rootfstype=auto rootwait
+	setexpr openwrt_rootpart ${distro_bootpart} + 1
+	setenv bootargs ${bootargs} root=/dev/mmcblk${devnum}p${openwrt_rootpart} rootfstype=auto rootwait
 fi
 
 # here one could add logic for other rootfs device types such as scsi and usb
diff --git a/target/linux/omap24xx/base-files/etc/config/wireless b/target/linux/omap24xx/base-files/etc/config/wireless
index f61721e..b640ce6 100644
--- a/target/linux/omap24xx/base-files/etc/config/wireless
+++ b/target/linux/omap24xx/base-files/etc/config/wireless
@@ -15,6 +15,6 @@  config wifi-iface
 	option powersave 1
 	option network  lan
 	option mode     sta
-	option ssid     LEDE
+	option ssid     OpenWrt
 #	option encryption psk2
 #	option key	"foobar"
diff --git a/target/linux/uml/README b/target/linux/uml/README
index d7cba1d..aa7bad9 100644
--- a/target/linux/uml/README
+++ b/target/linux/uml/README
@@ -1,4 +1,4 @@ 
-LEDE inside a user mode linux.  Why would we even want this many ask?
+OpenWrt inside a user mode linux.  Why would we even want this many ask?
 
 There are potentially a lot of reasons, one obvious one to me, it allows
 folks to 'kick the tires' without actually flashing up any hardware.  It's
@@ -17,7 +17,8 @@  build it all
 In your bin directory you will find a kernel and an ext4 root file system
 when it's finished.  Just run it like this:-
 
-bin/targets/uml/generic/lede-uml-vmlinux ubd0=bin/targets/uml/generic/lede-uml-ext4.img
+bin/targets/uml/generic/lede-uml-vmlinux
+ubd0=bin/targets/uml/generic/openwrt-uml-ext4.img
 
 The uml will start, and eventually the serial console of the uml will be at your
 console prompt.  If you would like it in xterms, substitute con=xterm and con0=xterm.
diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg
index 32ee687..3d47a95 100644
--- a/target/linux/x86/image/grub-iso.cfg
+++ b/target/linux/x86/image/grub-iso.cfg
@@ -5,6 +5,6 @@  set default="0"
 set timeout="@TIMEOUT@"
 set root='(cd)'
 
-menuentry "LEDE" {
+menuentry "OpenWrt" {
 	linux /boot/vmlinuz @CMDLINE@ noinitrd
 }
diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg
index acca036..9ec6b2d 100644
--- a/target/linux/x86/image/grub.cfg
+++ b/target/linux/x86/image/grub.cfg
@@ -5,9 +5,9 @@  set default="0"
 set timeout="@TIMEOUT@"
 set root='(@ROOT@)'
 
-menuentry "LEDE" {
+menuentry "OpenWrt" {
 	linux /boot/vmlinuz @CMDLINE@ noinitrd
 }
-menuentry "LEDE (failsafe)" {
+menuentry "OpenWrt (failsafe)" {
 	linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
 }
diff --git a/target/sdk/Config.in b/target/sdk/Config.in
index 095759d..0c8a61d 100644
--- a/target/sdk/Config.in
+++ b/target/sdk/Config.in
@@ -1,10 +1,10 @@ 
 config SDK
-	bool "Build the LEDE SDK"
+	bool "Build the OpenWrt SDK"
 	depends on !EXTERNAL_TOOLCHAIN
 	default BUILDBOT
 	help
 	  This is essentially a stripped-down version of the buildroot
 	  with a precompiled toolchain. It can be used to develop and
-	  test packages for LEDE before including them in the buildroot
+	  test packages for OpenWrt before including them in the buildroot
 
 
diff --git a/target/sdk/files/README.SDK b/target/sdk/files/README.SDK
index 6f04f94..6699dff 100644
--- a/target/sdk/files/README.SDK
+++ b/target/sdk/files/README.SDK
@@ -1,7 +1,7 @@ 
-This is the LEDE SDK. It contains a stripped-down version of
+This is the OpenWrt SDK. It contains a stripped-down version of
 the buildroot. You can use it to test/develop packages without
 having to compile your own toolchain or any of the libraries
-included with LEDE.
+included with OpenWrt.
 
 To use it, just put your buildroot-compatible package directory
 (including its dependencies) in the subdir 'package/' and run
diff --git a/target/toolchain/Config.in b/target/toolchain/Config.in
index e377c20..5a6ecef 100644
--- a/target/toolchain/Config.in
+++ b/target/toolchain/Config.in
@@ -1,8 +1,8 @@ 
 config MAKE_TOOLCHAIN
-	bool "Package the LEDE-based Toolchain"
+	bool "Package the OpenWrt-based Toolchain"
 	depends on !EXTERNAL_TOOLCHAIN
 	help
 	  Package the created toolchain as a tarball under the bin/ directory as
-	  LEDE-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX).
+	  OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX).
 	  For example, a toolchain for the MIPS architecture might be named
-	  LEDE-Toolchain-malta-for-mipsel_mips32-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2.
+	  OpenWrt-Toolchain-malta-for-mipsel_mips32-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2.
diff --git a/target/toolchain/files/README.TOOLCHAIN b/target/toolchain/files/README.TOOLCHAIN
index 86b0189..7c0586b 100644
--- a/target/toolchain/files/README.TOOLCHAIN
+++ b/target/toolchain/files/README.TOOLCHAIN
@@ -1,2 +1,2 @@ 
-This is the LEDE SDK. It contains just the toolchain created
+This is the OpenWrt SDK. It contains just the toolchain created
 by buildroot.
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index d7e205a..ac46563 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -53,8 +53,8 @@  endif
 
 PATCH_DIR=../patches/$(GCC_VERSION)
 
-BUGURL=http://www.lede-project.org/bugs/
-PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION)
+BUGURL=http://www.openwrt.org/bugs/
+PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION)
 
 HOST_BUILD_PARALLEL:=1