Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hi, Zoltan HERPAI schrieb am 02.11.2017 um 13:20: > For the sake of full transparency, Imre and me was not part of the vote, > as that was sent to lede-adm, without including openwrt-hackers or > openwrt-devel. and your PATCH v2 didn't go to lede-adm. a suggestion from a simple community member: everyone subscribes to all of these four lists instead of complaining about "this was not in the correct list". such small things delaying the merge is really annoying to watch... Regards Andreas P.S.: no i'm not on all of these lists, but i have no voting rights, so it doesn't delay or block something. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hi Hauke, Hauke Mehrtens wrote: On 10/26/2017 09:05 PM, Dave Taht wrote: Hannu Nyman writes: Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: + - + * 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 + - Still promoting the drink recipe although the voting is clearly going against release names and also all given feedback about drinks has been negative? I incidentally have always liked the in-your-face anti-establishment flair of using codenames based on alcoholic beverages. The drink meme beats the hell out of corporate blandness with selecting codenames out of a marketing jar - "Project Olympus!", and is easier to remember than 17.X.Y. "Blurry fish butt" I think was (until recently) a codename for the linux kernel. and I've joked elsewhere that I'd like a codename named "green goddess". https://www.allbud.com/marijuana-strains/sativa-dominant-hybrid/green-goddess Please get rid of it. It makes the whole thing looks adolescent. And replace it with what? (where was the voting?) The vote happened here: http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html I am also for removing this, without the code names it does not makes any sense. This banner is the first thing companies change to add they own brand. If you want to annoy them, use this license in some important part: ;-) WTFPL (Do What the Fuck You Want To Public License) Fine, then please advise where else this needs to be removed from, before I send the v3. $ grep RELEASE include/version.mk RELEASE:=Reboot VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) For the sake of full transparency, Imre and me was not part of the vote, as that was sent to lede-adm, without including openwrt-hackers or openwrt-devel. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
On 10/26/2017 09:05 PM, Dave Taht wrote: > Hannu Nyman writes: > >> Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: >>> + - >>> + * 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 >>> + - >> >> >> Still promoting the drink recipe although the voting is clearly going against >> release names and also all given feedback about drinks has been negative? > > I incidentally have always liked the in-your-face anti-establishment > flair of using codenames based on alcoholic beverages. The drink meme > beats the hell out of corporate blandness with selecting codenames out > of a marketing jar - "Project Olympus!", and is easier to remember than > 17.X.Y. > > "Blurry fish butt" I think was (until recently) a codename for the linux > kernel. > > and I've joked elsewhere that I'd like a codename named "green goddess". > > https://www.allbud.com/marijuana-strains/sativa-dominant-hybrid/green-goddess > >> Please get rid of it. It makes the whole thing looks adolescent. > > And replace it with what? (where was the voting?) The vote happened here: http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html I am also for removing this, without the code names it does not makes any sense. This banner is the first thing companies change to add they own brand. If you want to annoy them, use this license in some important part: ;-) WTFPL (Do What the Fuck You Want To Public License) Hauke ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Philip Prindeville wrote on 28.10.2017 23:20: Hi all, Does it seem to anyone else that we’re making this more complicated than it needs to be? If one of the goals we’re going for from here on out is “equality”, then a basic litmus test to be applied to any action might be “does this get us closer to a level playing field, or further away”? Since not everyone gets an @openwrt.org email address, I think the answer to “can we use @openwrt.org email addresses in SOB’s?” is by extension, “no, because it doesn’t get us closer to a level playing field." We don’t need to argue the finer points of the letter of the law if the spirit of the law is already adequately clear. -Philip Full Ack! And in addition, from my point of view, the openwrt mail service got seriously tainted, when the early LEDE founders got their @openwrt.org accounts deactivated without prior notice. What is it worth having such an address in a SOB, if you can't trust that it will last? Thanks, Hartmut ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hi all, Does it seem to anyone else that we’re making this more complicated than it needs to be? If one of the goals we’re going for from here on out is “equality”, then a basic litmus test to be applied to any action might be “does this get us closer to a level playing field, or further away”? Since not everyone gets an @openwrt.org email address, I think the answer to “can we use @openwrt.org email addresses in SOB’s?” is by extension, “no, because it doesn’t get us closer to a level playing field." We don’t need to argue the finer points of the letter of the law if the spirit of the law is already adequately clear. -Philip > On Oct 28, 2017, at 10:56 AM, p...@oranjevos.nl wrote: > > Dear Florian, > > Seems the discussion that was raised on using a personal openwrt address in a > SOB does not do much good so far and it is certainly not my intention to go > against rule #12; I would be sorry if I did. The question I raised is, > although about personal addresses, absolutely not aimed at anyone personally. > > Your thorough reading of the rules makes sense: the future tense of rule #10 > might be interpreted as to mean that existing addresses are exempted. But the > principal reason, equality, mentioned in that very same rule for not offering > (new) accounts under the openwrt domain, is by its sheer nature not > restricted to the future. The wording in the remerge rules tries to leave > some fair lapse for existing accounts, but using that space to the (maximum) > extend that a strict reading of the words would allow, does not seem right. > Usage for the purpose of (still) receiving mail is reasonable, using it > actively for sending mail is ... more complicated. > > On your question whether I purposely did not mention the restriction on > adherence to trademark policy and FOSS purpose, the answer is simple: it did > not seem relevant in this case (there is no reason to believe that the SOB > violated that rule). > > I do not think this issue warrants much more discussion as most that's > relevant has probably been said and the relevance is relative. > It's up to you guys to decide want you want, to weight the odds, regards from > a by-stander, > Paul ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Dear Florian, Seems the discussion that was raised on using a personal openwrt address in a SOB does not do much good so far and it is certainly not my intention to go against rule #12; I would be sorry if I did. The question I raised is, although about personal addresses, absolutely not aimed at anyone personally. Your thorough reading of the rules makes sense: the future tense of rule #10 might be interpreted as to mean that existing addresses are exempted. But the principal reason, equality, mentioned in that very same rule for not offering (new) accounts under the openwrt domain, is by its sheer nature not restricted to the future. The wording in the remerge rules tries to leave some fair lapse for existing accounts, but using that space to the (maximum) extend that a strict reading of the words would allow, does not seem right. Usage for the purpose of (still) receiving mail is reasonable, using it actively for sending mail is ... more complicated. On your question whether I purposely did not mention the restriction on adherence to trademark policy and FOSS purpose, the answer is simple: it did not seem relevant in this case (there is no reason to believe that the SOB violated that rule). I do not think this issue warrants much more discussion as most that's relevant has probably been said and the relevance is relative. It's up to you guys to decide want you want, to weight the odds, regards from a by-stander, Paul > Op 27 okt. 2017, om 21:54 heeft Florian Fainelli het > volgende geschreven: > > On 10/27/2017 02:34 AM, p...@oranjevos.nl wrote: >> Dear Imre, >> >> On the info for the version of the patch: my error, must have overlooked the >> included version info, it is indeed included. >> >> About the use of openwrt email addresses in the SOB: >> This has been discussed before, and the arguments against using an openwrt >> mail address as a personal address haven't vanished. >> The address in the SOB is meant to identify a contributor, most likely a >> natural person, not some entity of the openwrt project. Usage of an openwrt >> mail address suggests that the person using that address has another >> position in the project than those that use mail addresses not within the >> openwrt.org domain, which does not go well with LEDE rules. >> >> IIRC, during discussions on the remerge, the following compromis was >> reached: usage of personal openwrt addresses wasn't ruled out completely, >> but only in passive sense, as a means to keep receiving mail on the address >> and active usage for personal business is not allowed. John remerge proposal >> v3 states clearly: >> - mail addresses may under no conditions be used for any personal business, >> consultancy, applying for jobs, ... purposes > > Did you purposely omit the next bullet item that says? > > - any mail sent from an openwrt.org account needs to adhere the > trademark policy and should only be used for FOSS purposes > > Link: > http://lists.infradead.org/pipermail/lede-adm/2017-May/000517.html > >> >> As a mail address in a SOB is a personal address, is meant to be that, using >> an openwrt address in a SOB goes directly against the agreed on rules, and >> certainly against the spirit of the LEDE rules that have proven to be >> successful in making the project getting traction and commitment. > > LEDE project rule #10 does only stipulate that new email addresses will > not be given away on the premises of and privacy and equality: > > https://lede-project.org/rules > > 10. The project will not offer email accounts under its project domain > for privacy and equality reasons. > > > That sentence is written with the future tense, and therefore does not > try to impose or specify anything with respect to emails given before > (so in the past). > > Therefore, my reading of the LEDE project rules and the remerge proposal > makes me so inclined as to think that Imre is not in direct violation of > the LEDE project rules regarding the use of an @openwrt.org email > contributor for FOSS perspectives. > > Quite frankly, if the goal is just to give Zoltan and Imre a hard time > and nitpick on everything possible just to delay (purposely or not) the > remerge, then you are doing a great job at it, but this goes against > rule #12. > >> Paul >> >> >> >> >>> Op 26 okt. 2017, om 18:32 heeft Imre Kaloz het volgende >>> geschreven: >>> >>> Hi Paul, >>> >>> On 2017-10-26 18:16, p...@oranjevos.nl wrote: Please, could you add some info on what has changed with the new version of the patch ? And, it would be appreciated when the SOB would not use an openwrt.org mail address (assuming Imre has another suitable mail available). Paul > Op 26 okt. 2017, om 17:41 heeft Zoltan HERPAI > het volgende geschreven: > > Given that we've decided to sail under the same flag for > the benefit of the whole community, and acknowledge the > achi
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
On 10/27/2017 02:34 AM, p...@oranjevos.nl wrote: > Dear Imre, > > On the info for the version of the patch: my error, must have overlooked the > included version info, it is indeed included. > > About the use of openwrt email addresses in the SOB: > This has been discussed before, and the arguments against using an openwrt > mail address as a personal address haven't vanished. > The address in the SOB is meant to identify a contributor, most likely a > natural person, not some entity of the openwrt project. Usage of an openwrt > mail address suggests that the person using that address has another position > in the project than those that use mail addresses not within the openwrt.org > domain, which does not go well with LEDE rules. > > IIRC, during discussions on the remerge, the following compromis was reached: > usage of personal openwrt addresses wasn't ruled out completely, but only in > passive sense, as a means to keep receiving mail on the address and active > usage for personal business is not allowed. John remerge proposal v3 states > clearly: > - mail addresses may under no conditions be used for any personal business, > consultancy, applying for jobs, ... purposes Did you purposely omit the next bullet item that says? - any mail sent from an openwrt.org account needs to adhere the trademark policy and should only be used for FOSS purposes Link: http://lists.infradead.org/pipermail/lede-adm/2017-May/000517.html > > As a mail address in a SOB is a personal address, is meant to be that, using > an openwrt address in a SOB goes directly against the agreed on rules, and > certainly against the spirit of the LEDE rules that have proven to be > successful in making the project getting traction and commitment. LEDE project rule #10 does only stipulate that new email addresses will not be given away on the premises of and privacy and equality: https://lede-project.org/rules 10. The project will not offer email accounts under its project domain for privacy and equality reasons. That sentence is written with the future tense, and therefore does not try to impose or specify anything with respect to emails given before (so in the past). Therefore, my reading of the LEDE project rules and the remerge proposal makes me so inclined as to think that Imre is not in direct violation of the LEDE project rules regarding the use of an @openwrt.org email contributor for FOSS perspectives. Quite frankly, if the goal is just to give Zoltan and Imre a hard time and nitpick on everything possible just to delay (purposely or not) the remerge, then you are doing a great job at it, but this goes against rule #12. > Paul > > > > >> Op 26 okt. 2017, om 18:32 heeft Imre Kaloz het volgende >> geschreven: >> >> Hi Paul, >> >> On 2017-10-26 18:16, p...@oranjevos.nl wrote: >>> Please, could you add some info on what has changed with the new version of >>> the patch ? >>> And, it would be appreciated when the SOB would not use an openwrt.org mail >>> address (assuming Imre has another suitable mail available). >>> >>> Paul >>> >>> Op 26 okt. 2017, om 17:41 heeft Zoltan HERPAI het volgende geschreven: 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. v2: - dismiss bugtracker and forum change - update uhttpd cert gen - update banner - update busybox NSLOOKUP patch Signed-off-by: Zoltan HERPAI Signed-off-by: Imre Kaloz >> >> Please find the changes listed in the description, but left it in above as >> well. As for using another email address, I won't use my personal one for >> this as I don't use this for that, simply as that. This is fully following >> what the merge agreement that has been voted for and got accepted defined. >> >> >> Best, >> Imre >> > > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev > -- Florian ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Dear Imre, On the info for the version of the patch: my error, must have overlooked the included version info, it is indeed included. About the use of openwrt email addresses in the SOB: This has been discussed before, and the arguments against using an openwrt mail address as a personal address haven't vanished. The address in the SOB is meant to identify a contributor, most likely a natural person, not some entity of the openwrt project. Usage of an openwrt mail address suggests that the person using that address has another position in the project than those that use mail addresses not within the openwrt.org domain, which does not go well with LEDE rules. IIRC, during discussions on the remerge, the following compromis was reached: usage of personal openwrt addresses wasn't ruled out completely, but only in passive sense, as a means to keep receiving mail on the address and active usage for personal business is not allowed. John remerge proposal v3 states clearly: - mail addresses may under no conditions be used for any personal business, consultancy, applying for jobs, ... purposes As a mail address in a SOB is a personal address, is meant to be that, using an openwrt address in a SOB goes directly against the agreed on rules, and certainly against the spirit of the LEDE rules that have proven to be successful in making the project getting traction and commitment. Please take this opinion of an outsider seriously, regards, Paul > Op 26 okt. 2017, om 18:32 heeft Imre Kaloz het volgende > geschreven: > > Hi Paul, > > On 2017-10-26 18:16, p...@oranjevos.nl wrote: >> Please, could you add some info on what has changed with the new version of >> the patch ? >> And, it would be appreciated when the SOB would not use an openwrt.org mail >> address (assuming Imre has another suitable mail available). >> >> Paul >> >> >>> Op 26 okt. 2017, om 17:41 heeft Zoltan HERPAI >>> het volgende geschreven: >>> >>> 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. >>> >>> v2: - dismiss bugtracker and forum change >>>- update uhttpd cert gen >>>- update banner >>>- update busybox NSLOOKUP patch >>> >>> Signed-off-by: Zoltan HERPAI >>> >>> >>> Signed-off-by: Imre Kaloz >>> >>> >>> >>> > > Please find the changes listed in the description, but left it in above as > well. As for using another email address, I won't use my personal one for > this as I don't use this for that, simply as that. This is fully following > what the merge agreement that has been voted for and got accepted defined. > > > Best, > Imre > ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hannu Nyman wrote: > Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: > > + - > > + * 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 > > + - > > > Still promoting the drink recipe although the voting is clearly > going against release names and also all given feedback about > drinks has been negative? Not all. I quite like the drinks, I was just strongly against going back to the old name. right now. When DD was chosen it was far from 100% one way or the other too. Cheers, Karl P signature.html Description: OpenPGP Digital Signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
On 10/26/2017 9:05 PM, Dave Taht wrote: "Blurry fish butt" I think was (until recently) a codename for the linux kernel. It's just Torvalds making fun of codenames, the linux kernel "codename" isn't used anywhere outside of Torvalds posts. -Alberto ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hannu Nyman writes: > Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: >> + - >> + * 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 >> + - > > > Still promoting the drink recipe although the voting is clearly going against > release names and also all given feedback about drinks has been negative? I incidentally have always liked the in-your-face anti-establishment flair of using codenames based on alcoholic beverages. The drink meme beats the hell out of corporate blandness with selecting codenames out of a marketing jar - "Project Olympus!", and is easier to remember than 17.X.Y. "Blurry fish butt" I think was (until recently) a codename for the linux kernel. and I've joked elsewhere that I'd like a codename named "green goddess". https://www.allbud.com/marijuana-strains/sativa-dominant-hybrid/green-goddess > Please get rid of it. It makes the whole thing looks adolescent. And replace it with what? (where was the voting?) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: + - + * 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 + - Still promoting the drink recipe although the voting is clearly going against release names and also all given feedback about drinks has been negative? Please get rid of it. It makes the whole thing looks adolescent. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Please, could you add some info on what has changed with the new version of the patch ? And, it would be appreciated when the SOB would not use an openwrt.org mail address (assuming Imre has another suitable mail available). Paul > Op 26 okt. 2017, om 17:41 heeft Zoltan HERPAI het volgende > geschreven: > > 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. > > v2: - dismiss bugtracker and forum change >- update uhttpd cert gen >- update banner >- update busybox NSLOOKUP patch > > Signed-off-by: Zoltan HERPAI > Signed-off-by: Imre Kaloz > --- > Config.in | 2 +- > Makefile | 2 +- > README | 6 +++--- > include/image-commands.mk | 6 +++--- > include/image.mk | 2 +- > include/prereq-build.mk| 2 +- > include/version.mk | 8 > package/base-files/Makefile| 2 +- > package/base-files/files/bin/config_generate | 10 +- > package/base-files/files/etc/banner| 23 -- > package/base-files/files/etc/init.d/system | 2 +- > .../files/lib/preinit/10_indicate_preinit | 2 +- > package/base-files/image-config.in | 10 +- > package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- > .../kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 2 +- > package/kernel/mac80211/files/lib/wifi/mac80211.sh | 2 +- > package/network/services/hostapd/files/hostapd.sh | 4 ++-- > package/network/services/lldpd/files/lldpd.config | 2 +- > package/network/services/lldpd/files/lldpd.init| 2 +- > .../network/services/samba36/files/samba.config| 4 ++-- > package/network/services/samba36/files/samba.init | 6 +++--- > .../network/services/uhttpd/files/uhttpd.config| 2 +- > package/network/services/uhttpd/files/uhttpd.init | 2 +- > package/network/utils/iproute2/Makefile| 2 +- > package/utils/busybox/Config-defaults.in | 4 ++-- > package/utils/busybox/config/networking/Config.in | 12 +-- > .../busybox/patches/230-add_nslookup_lede.patch| 16 +++ > package/utils/ct-bugcheck/src/bugcheck.sh | 4 ++-- > scripts/brcmImage.pl | 2 +- > scripts/checkpatch.pl | 2 +- > scripts/config/mconf.c | 2 +- > scripts/qemustart | 12 +-- > target/imagebuilder/Config.in | 2 +- > target/imagebuilder/files/repositories.conf| 2 +- > target/linux/apm821xx/image/Makefile | 2 +- > target/linux/ar71xx/image/generic.mk | 4 ++-- > target/linux/ar71xx/image/legacy.mk| 4 ++-- > target/linux/ar71xx/image/tp-link.mk | 2 +- > target/linux/armvirt/README| 16 +++ > target/linux/brcm63xx/image/bcm63xx.mk | 6 +++--- > target/linux/lantiq/image/Makefile | 2 +- > target/linux/mcs814x/image/Makefile| 2 +- > target/linux/mvebu/image/cfbase-boot.script| 4 ++-- > target/linux/mvebu/image/cfpro-boot.script | 4 ++-- > .../linux/omap24xx/base-files/etc/config/wireless | 2 +- > target/linux/uml/README| 5 +++-- > target/linux/x86/image/grub-iso.cfg| 2 +- > target/linux/x86/image/grub.cfg| 4 ++-- > target/sdk/Config.in | 4 ++-- > target/sdk/files/README.SDK| 4 ++-- > target/toolchain/Config.in | 6 +++--- > target/toolchain/files/README.TOOLCHAIN| 2 +- > toolchain/gcc/common.mk| 4 ++-- > 53 files changed, 124 insertions(+), 120 deletions(-) > > 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 1006
[LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
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. v2: - dismiss bugtracker and forum change - update uhttpd cert gen - update banner - update busybox NSLOOKUP patch Signed-off-by: Zoltan HERPAI Signed-off-by: Imre Kaloz --- Config.in | 2 +- Makefile | 2 +- README | 6 +++--- include/image-commands.mk | 6 +++--- include/image.mk | 2 +- include/prereq-build.mk| 2 +- include/version.mk | 8 package/base-files/Makefile| 2 +- package/base-files/files/bin/config_generate | 10 +- package/base-files/files/etc/banner| 23 -- package/base-files/files/etc/init.d/system | 2 +- .../files/lib/preinit/10_indicate_preinit | 2 +- package/base-files/image-config.in | 10 +- package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- .../kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 2 +- package/kernel/mac80211/files/lib/wifi/mac80211.sh | 2 +- package/network/services/hostapd/files/hostapd.sh | 4 ++-- package/network/services/lldpd/files/lldpd.config | 2 +- package/network/services/lldpd/files/lldpd.init| 2 +- .../network/services/samba36/files/samba.config| 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- .../network/services/uhttpd/files/uhttpd.config| 2 +- package/network/services/uhttpd/files/uhttpd.init | 2 +- package/network/utils/iproute2/Makefile| 2 +- package/utils/busybox/Config-defaults.in | 4 ++-- package/utils/busybox/config/networking/Config.in | 12 +-- .../busybox/patches/230-add_nslookup_lede.patch| 16 +++ package/utils/ct-bugcheck/src/bugcheck.sh | 4 ++-- scripts/brcmImage.pl | 2 +- scripts/checkpatch.pl | 2 +- scripts/config/mconf.c | 2 +- scripts/qemustart | 12 +-- target/imagebuilder/Config.in | 2 +- target/imagebuilder/files/repositories.conf| 2 +- target/linux/apm821xx/image/Makefile | 2 +- target/linux/ar71xx/image/generic.mk | 4 ++-- target/linux/ar71xx/image/legacy.mk| 4 ++-- target/linux/ar71xx/image/tp-link.mk | 2 +- target/linux/armvirt/README| 16 +++ target/linux/brcm63xx/image/bcm63xx.mk | 6 +++--- target/linux/lantiq/image/Makefile | 2 +- target/linux/mcs814x/image/Makefile| 2 +- target/linux/mvebu/image/cfbase-boot.script| 4 ++-- target/linux/mvebu/image/cfpro-boot.script | 4 ++-- .../linux/omap24xx/base-files/etc/config/wireless | 2 +- target/linux/uml/README| 5 +++-- target/linux/x86/image/grub-iso.cfg| 2 +- target/linux/x86/image/grub.cfg| 4 ++-- target/sdk/Config.in | 4 ++-- target/sdk/files/README.SDK| 4 ++-- target/toolchain/Config.in | 6 +++--- target/toolchain/files/README.TOOLCHAIN| 2 +- toolchain/gcc/common.mk| 4 ++-- 53 files changed, 124 insertions(+), 120 deletions(-) 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 Communi
