Re: [LEDE-DEV] merge: add OpenWrt branding

2017-10-24 Thread Zoltan HERPAI 

Hi Jo,

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


Hi,

comments inline.


Signed-off-by: Imre Kaloz 


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 " --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' \
+

Re: [LEDE-DEV] merge: add OpenWrt branding

2017-10-24 Thread Zoltan HERPAI 

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-

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] merge: add OpenWrt branding

2017-10-24 Thread Daniel Golle 
On Tue, Oct 24, 2017 at 03:07:04PM +0200, Jo-Philipp Wich wrote:
> Hi,
> 
> comments inline.
> 
> > Signed-off-by: Imre Kaloz 
> 
> 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 " --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 'ab...@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)



___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] merge: add OpenWrt branding

2017-10-24 Thread Jo-Philipp Wich 
Hi,

comments inline.

> Signed-off-by: Imre Kaloz 

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 " --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.