From knaack.h at gmx.de Wed Nov 1 20:18:43 2017 From: knaack.h at gmx.de (Hartmut Knaack) Date: Thu, 2 Nov 2017 01:18:43 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: <2b6eea5d-eacf-d044-0401-7d8ccae6f7c2@openwrt.org> References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <164183C7-7D81-4482-AE8F-84E0D96FF3E1@oranjevos.nl> <96C70080-F075-41FB-B9C2-E57413214916@redfish-solutions.com> <0542b313-336a-ac40-efee-f36040a25893@gmx.de> <2b6eea5d-eacf-d044-0401-7d8ccae6f7c2@openwrt.org> Message-ID: Mike Baker wrote on 31.10.2017 04:46: > On 10/28/2017 4:52 PM, Hartmut Knaack wrote: > >> 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, > Actually you've both hit the nail on the head, the email accounts were > disabled immediately after the LEDE announcement because it was > announced using an openwrt email address but without discussion, prior > knowledge or approval from the rest of the group. > This raises some more questions: which terms and conditions did people have to approve to get an @openwrt.org address? Where can these terms and conditions be found? Is every email sent from such an address supposed to be discussed and approved by the group before it gets sent? Furthermore: how many percent of "the group" needs to agree when it comes to disabling someones address? 50% or 67%? > (All history now, let's work on fixing things) If we don't learn from our mistakes, history will repeat. > > - Mike > > _______________________________________________ > Lede-dev mailing list > Lede-dev at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Thu Nov 2 08:02:23 2017 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Thu, 2 Nov 2017 13:02:23 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: <874lqlbuht.fsf@nemesis.taht.net> References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <89133d3e-1b15-5009-f4d2-61535a4906f1@iki.fi> <874lqlbuht.fsf@nemesis.taht.net> Message-ID: 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 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Thu Nov 2 08:20:44 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Thu, 02 Nov 2017 13:20:44 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <89133d3e-1b15-5009-f4d2-61535a4906f1@iki.fi> <874lqlbuht.fsf@nemesis.taht.net> Message-ID: <59FB0D9C.4080903@uid0.hu> 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 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mbm at openwrt.org Thu Nov 2 11:59:55 2017 From: mbm at openwrt.org (Mike Baker) Date: Thu, 2 Nov 2017 08:59:55 -0700 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <164183C7-7D81-4482-AE8F-84E0D96FF3E1@oranjevos.nl> <96C70080-F075-41FB-B9C2-E57413214916@redfish-solutions.com> <0542b313-336a-ac40-efee-f36040a25893@gmx.de> <2b6eea5d-eacf-d044-0401-7d8ccae6f7c2@openwrt.org> Message-ID: On 11/1/2017 5:18 PM, Hartmut Knaack wrote: > This raises some more questions: which terms and conditions did people > have > to approve to get an @openwrt.org address? Where can these terms and > conditions be found? Is every email sent from such an address supposed to > be discussed and approved by the group before it gets sent? > Furthermore: how many percent of "the group" needs to agree when it comes > to disabling someones address? 50% or 67%? The issue is the use of an openwrt email address to make an announcement on behalf of openwrt stating that openwrt had become lede without ever discussing it. There were no warning signs, everybody from openwrt suddenly found out that there was a new project and they had been kicked out. - Mike _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From knaack.h at gmx.de Thu Nov 2 16:44:19 2017 From: knaack.h at gmx.de (Hartmut Knaack) Date: Thu, 2 Nov 2017 21:44:19 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <164183C7-7D81-4482-AE8F-84E0D96FF3E1@oranjevos.nl> <96C70080-F075-41FB-B9C2-E57413214916@redfish-solutions.com> <0542b313-336a-ac40-efee-f36040a25893@gmx.de> <2b6eea5d-eacf-d044-0401-7d8ccae6f7c2@openwrt.org> Message-ID: Mike Baker wrote on 02.11.2017 16:59: > On 11/1/2017 5:18 PM, Hartmut Knaack wrote: > >> This raises some more questions: which terms and conditions did people >> have >> to approve to get an @openwrt.org address? Where can these terms and >> conditions be found? Is every email sent from such an address supposed to >> be discussed and approved by the group before it gets sent? >> Furthermore: how many percent of "the group" needs to agree when it comes >> to disabling someones address? 50% or 67%? > The issue is the use of an openwrt email address to make an announcement > on behalf of openwrt stating that openwrt had become lede without ever > discussing it. There were no warning signs, everybody from openwrt > suddenly found out that there was a new project and they had been kicked > out. > > - Mike > I'm reading over Jows announcement over and over again, but can not see, where he would announce it on behalf of openwrt. He has been using his @openwrt.org, just like countless times before on the mailing list. I can also not find the claim, that LEDE would be the successor of openwrt, just that quite a lot of active developers would try to start a new project with a different focus on certain issues. I agree, that there were no warning signs on the public mailing list. But still, what have been the terms and conditions for project email addresses? How are sanctions decided? And if I pick up your statement, that using an openwrt email address implies that it is sent on behalf of openwrt (and thus, reviewed by the project members and acknowledged by the majority), there should just be one account for public relations (like version announcements, business communication on behalf of the project). I understand, that your feelings got hurt by the announcement, but your reaction was not professional. So, IMHO you messed up, now deal with it. Thanks, Hartmut _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mbm at openwrt.org Fri Nov 3 01:40:42 2017 From: mbm at openwrt.org (Mike Baker) Date: Thu, 2 Nov 2017 22:40:42 -0700 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding In-Reply-To: References: <1509032482-21415-1-git-send-email-wigyori@uid0.hu> <164183C7-7D81-4482-AE8F-84E0D96FF3E1@oranjevos.nl> <96C70080-F075-41FB-B9C2-E57413214916@redfish-solutions.com> <0542b313-336a-ac40-efee-f36040a25893@gmx.de> <2b6eea5d-eacf-d044-0401-7d8ccae6f7c2@openwrt.org> Message-ID: <01479251-3a0f-8125-7be8-35b46bb3bf44@openwrt.org> On 11/2/2017 1:44 PM, Hartmut Knaack wrote: > I agree, that there were no warning signs on the public mailing list. As I said before, all history now; discussing it further serves no purpose. - Mike _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From nemesis at ninux.org Fri Nov 3 05:39:45 2017 From: nemesis at ninux.org (nemesis) Date: Fri, 03 Nov 2017 10:39:45 +0100 Subject: [OpenWrt-Devel] Bringing young people in the community: Google Code-In 2017 Message-ID: Hi everyone, I'm Federico Capoano, some of you may know me for my involvement with Ninux, NetJSON, OpenWISP and contribution to several editions of the Google Summer of Code with Freifunk. OpenWISP has been accepted into the Google Code-In: https://codein.withgoogle.com/organizations/openwisp/ By participating in this program we hope to attract many new young contributors in the world of open source networking, free wifi and similar topics. We aim at proposing easy tasks related to documentation, tutorials, fixing small code issues, UX improvements and so on. We are looking for mentors that share similar goals with us and want to get involved, for those of you that are following the NetJSON development or using some OpenWISP tool, this would be a good time to start contributing! We also would like to invite mentors that want to propose tasks that are related to OpenWRT/LEDE (as indicated to some of you at the last OpenWRT Summit in Prague). Important notes: - we want mentors to take care of the tasks they propose - please read the GCI rules, in particular section 2, 4 and 5: https://developers.google.com/open-source/gci/resources/contest-rules - take a look at the tasks proposals we are working on (we will export this collaborative spreadsheet to CSV) and import it using the GCI API: https://docs.google.com/spreadsheets/d/1nNNN6Db8fS3KtijO9BJB2YHmMzU20OUBoFrXdWk055I/edit#gid=820690942 If interested, please get in touch with us via our support channels (IRC, mailing list, gitter) http://openwisp.org/support.html or reply in private to me (in order to avoid cross-post hell). Thank you for your attention! Best regards Nemesis _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Sat Nov 4 14:04:11 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Sat, 4 Nov 2017 19:04:11 +0100 Subject: [OpenWrt-Devel] [PATCH v3] merge: add OpenWrt branding Message-ID: <1509818651-25329-1-git-send-email-wigyori@uid0.hu> 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 v3: - drop recipe in banner - drop release name as per [1], update banner accordingly - drop VERSION_NICK [1] http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html 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 | 16 ++++------------ package/base-files/Makefile | 2 +- package/base-files/files/bin/config_generate | 10 +++++----- package/base-files/files/etc/banner | 18 ++++++++---------- package/base-files/files/etc/init.d/system | 2 +- .../base-files/files/lib/preinit/10_indicate_preinit | 2 +- package/base-files/image-config.in | 10 +++++----- package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- package/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 +- package/network/services/samba36/files/samba.config | 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- package/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 ++++++------ .../utils/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 ++-- target/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, 119 insertions(+), 128 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 Community + http://www.openwrt.org diff --git a/include/image-commands.mk b/include/image-commands.mk index 1ec5252..59526d4 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 96a8892..8c67083 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..7fdb43b 100644 --- a/include/version.mk +++ b/include/version.mk @@ -10,13 +10,10 @@ # REVISION:=x # SOURCE_DATE_EPOCH:=x -RELEASE:=Reboot - PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_NUMBER \ CONFIG_VERSION_CODE \ - CONFIG_VERSION_NICK \ CONFIG_VERSION_REPO \ CONFIG_VERSION_DIST \ CONFIG_VERSION_MANUFACTURER \ @@ -36,21 +33,18 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) -VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) -VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) - VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots) +VERSION_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/) @@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ -e 's,%C,$(VERSION_CODE),g' \ -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \ - -e 's,%N,$(VERSION_NICK),g' \ - -e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \ -e 's,%D,$(VERSION_DIST),g' \ -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ -e 's,%R,$(REVISION),g' \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e6c53e9..459573a 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. at system[0] add system system - set system. at system[-1].hostname='LEDE' + set system. at system[-1].hostname='OpenWrt' set system. at system[-1].timezone='UTC' set system. at system[-1].ttylogin='0' set system. at system[-1].log_size='64' @@ -233,10 +233,10 @@ generate_static_system() { set system.ntp='timeserver' set system.ntp.enabled='1' set system.ntp.enable_server='0' - add_list system.ntp.server='0.lede.pool.ntp.org' - add_list system.ntp.server='1.lede.pool.ntp.org' - add_list system.ntp.server='2.lede.pool.ntp.org' - add_list system.ntp.server='3.lede.pool.ntp.org' + add_list system.ntp.server='0.openwrt.pool.ntp.org' + add_list system.ntp.server='1.openwrt.pool.ntp.org' + add_list system.ntp.server='2.openwrt.pool.ntp.org' + add_list system.ntp.server='3.openwrt.pool.ntp.org' EOF if json_is_a system object; then diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner index 4ec646a..f3af3c0 100644 --- a/package/base-files/files/etc/banner +++ b/package/base-files/files/etc/banner @@ -1,10 +1,8 @@ - _________ - / /\ _ ___ ___ ___ - / LE / \ | | | __| \| __| - / DE / \ | |__| _|| |) | _| - /________/ LE \ |____|___|___/|___| lede-project.org - \ \ DE / - \ LE \ / ----------------------------------------------------------- - \ DE \ / %N (%V, %C) - \________\/ ----------------------------------------------------------- - + _______ ________ __ + | |.-----.-----.-----.| | | |.----.| |_ + | - || _ | -__| || | | || _|| _| + |_______|| __|_____|__|__||________||__| |____| + |__| W I R E L E S S F R E E D O M + ----------------------------------------------------- + %D %V, %C + ----------------------------------------------------- diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system index 8c5f677..531aa8c 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 144e49b..c9c98f1 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. at 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..47270bc 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:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/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/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch index e394dfb..14c0e87 100644 --- a/package/utils/busybox/patches/230-add_nslookup_lede.patch +++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch @@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + -+//config:config NSLOOKUP_LEDE -+//config: bool "nslookup_lede" ++//config:config NSLOOKUP_OPENWRT ++//config: bool "nslookup_openwrt" +//config: depends on !NSLOOKUP +//config: default y +//config: help +//config: nslookup is a tool to query Internet name servers (LEDE flavor). +//config: -+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS +//config: bool "Enable long options" +//config: default y -+//config: depends on NSLOOKUP_LEDE && LONG_OPTS ++//config: depends on NSLOOKUP_OPENWRT && LONG_OPTS +//config: help +//config: Support long options for the nslookup applet. + -+//applet:IF_NSLOOKUP_LEDE(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) ++//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) + -+//kbuild:lib-$(CONFIG_NSLOOKUP_LEDE) += nslookup_lede.o ++//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o + +//usage:#define nslookup_lede_trivial_usage +//usage: "[HOST] [SERVER]" @@ -753,7 +753,7 @@ Signed-off-by: Jo-Philipp Wich +} + + -+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS +static const char nslookup_longopts[] ALIGN1 = + "type\0" Required_argument "q" + "querytype\0" Required_argument "q" @@ -778,7 +778,7 @@ Signed-off-by: Jo-Philipp Wich + unsigned int types = 0; + HEADER *header; + -+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS + applet_long_options = nslookup_longopts; +#endif + 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 b7689c2..5122880 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 f22b8ad..830bba6 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 -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From nbd at nbd.name Sun Nov 5 07:54:52 2017 From: nbd at nbd.name (Felix Fietkau) Date: Sun, 5 Nov 2017 13:54:52 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v3] merge: add OpenWrt branding In-Reply-To: <1509818651-25329-1-git-send-email-wigyori@uid0.hu> References: <1509818651-25329-1-git-send-email-wigyori@uid0.hu> Message-ID: On 2017-11-04 19:04, Zoltan HERPAI 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. > > v2: - dismiss bugtracker and forum change > - update uhttpd cert gen > - update banner > - update busybox NSLOOKUP patch > > v3: - drop recipe in banner > - drop release name as per [1], update banner accordingly > - drop VERSION_NICK > > [1] http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html Please leave repository / bug tracker URLs untouched until we've actually migrated them. You could even make things easier to review by splitting up your changes some more. - Felix _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Sun Nov 5 14:14:46 2017 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Sun, 5 Nov 2017 20:14:46 +0100 Subject: [OpenWrt-Devel] [PATCH v3] merge: add OpenWrt branding In-Reply-To: <1509818651-25329-1-git-send-email-wigyori@uid0.hu> References: <1509818651-25329-1-git-send-email-wigyori@uid0.hu> Message-ID: Thanks for this good work Zoltan, this is not any easy patch. On 11/04/2017 07:04 PM, Zoltan HERPAI 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. > > v2: - dismiss bugtracker and forum change > - update uhttpd cert gen > - update banner > - update busybox NSLOOKUP patch > > v3: - drop recipe in banner > - drop release name as per [1], update banner accordingly > - drop VERSION_NICK > > [1] http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html > > Signed-off-by: Zoltan HERPAI > Signed-off-by: Imre Kaloz In general this looks good to me. I think you should split up the parts changing URLs, so we can apply them when the URLs changed. One patch which changes of the main website link: http://www.openwrt.org One patch with the download mirror: - default "http://downloads.lede-project.org/snapshots" + default "http://downloads.openwrt.org/snapshots" ...... > diff --git a/include/version.mk b/include/version.mk > index 1a0d3c9..7fdb43b 100644 > --- a/include/version.mk > +++ b/include/version.mk > @@ -10,13 +10,10 @@ > # REVISION:=x > # SOURCE_DATE_EPOCH:=x > > -RELEASE:=Reboot > - > PKG_CONFIG_DEPENDS += \ > CONFIG_VERSION_BUG_URL \ > CONFIG_VERSION_NUMBER \ > CONFIG_VERSION_CODE \ > - CONFIG_VERSION_NICK \ > CONFIG_VERSION_REPO \ > CONFIG_VERSION_DIST \ > CONFIG_VERSION_MANUFACTURER \ > @@ -36,21 +33,18 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) > VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) > VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) > > -VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) > -VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) > - > VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) > -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots) > +VERSION_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/) > @@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ > -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ > -e 's,%C,$(VERSION_CODE),g' \ > -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \ > - -e 's,%N,$(VERSION_NICK),g' \ > - -e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \ > -e 's,%D,$(VERSION_DIST),g' \ > -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ > -e 's,%R,$(REVISION),g' \ Should we remove the nick or set it to an empty string? I do not really care. .......... > diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk > index f22b8ad..830bba6 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) Please use a seperate patch for this, this is pointing to a LEDE wiki page. Hauke _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From yugang at telincn.com Sun Nov 5 20:05:59 2017 From: yugang at telincn.com (yugang at telincn.com) Date: Mon, 6 Nov 2017 09:05:59 +0800 Subject: [OpenWrt-Devel] pagemap Message-ID: <201711060905388951296@telincn.com>+7BBAF41D56355A5E Hi all, Is there a way to make openwrt to surpport pagemap? Regards, Ewan yugang at telincn.com -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ajaygargnsit at gmail.com Tue Nov 7 00:52:06 2017 From: ajaygargnsit at gmail.com (Ajay Garg) Date: Tue, 7 Nov 2017 11:22:06 +0530 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? Message-ID: Hi All. I have been trying to build the toolchain+packages (especially openssl) using openwrt, but have been unable to do so for a armv7-ar architecture. The processor on our SOC is https://www.digikey.com/product-detail/en/microchip-technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 So, is there an (already existing) configuration (in "make menuconfig", or otherwise) that builds everything (toolchain plus packages) for armv7-ar? Will be grateful to listen from you experts. Thanks and Regards, Ajay -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From john at phrozen.org Tue Nov 7 03:38:12 2017 From: john at phrozen.org (John Crispin) Date: Tue, 7 Nov 2017 09:38:12 +0100 Subject: [OpenWrt-Devel] [remerge] summit meeting notes / roadmap Message-ID: <33f13505-d3e7-1799-e112-4ee56c047fc4@phrozen.org> Hi, during the openwrt-summit we held a meeting to discuss the next steps of the remerge. We should vote on whether we want to implement the following tasks. * Mailing-lists ? There shall be 3 lists. All other lists that existed before/after the ? reboot shall be shutdown. ? - #openwrt - all contributions, patches, ideas, ... ? - #openwrt-announce - new releases, security, ... ? - #openwrt-org - admin foo ? The mailing lists shall be hosted on infradead.org. We will contact ? David Woodhouse and ask him to help with the migration. We will send out ? automated subscriptions with a letter that we have yet to draft * get onto the distro security ML ? - http://oss-security.openwall.org/wiki/mailing-lists/distros * git trees ? - move remaining patches from owrt tree -> lede tree ? - rebrand lede tree (patch V3 was posted, pending review) ? - backup current owrt tree ? - move openwrt.git to openwrt-legacy.git ? - move CC changes from owrt->lede branch (openwrt/source) to sync the trees * github ? - consolidate github organisation members ? - start pushing git.lede-project.org tree to openwrt org ? - build a script to automagically close PRs on the lede org with a note ??? telling folks to use owrt instead ? - go over all PRs and close the old ones asking people to repost if still ??? relevant * IRC ? There shall be 3 channels. All other channels that existed before/after ? the reboot shall be shutdown ? - #openwrt ? - #openwrt-devel ? - #openwrt-org ? - shutdown #openwrt-hackers ? Channel admin status shall be shared by enabling project cloaking for all ? voting members. ? Change topics redirecting folks to new channels, after a grace period ? enable forced redirect for new joins * trac ? - edit trac header and add a link to bugs.openwrt.org ? - clone the whole content into static html ? - setup nginx / rewrite rules and host static content * domains ? - add bugs.openwrt.org -> bugs.lede-project.org ? - add git.openwrt.org > git.lede-project.org ? - add phaseX.build.openwrt.org -> phaseX.build.lede-project.org ? - keep dev.openwrt.org -> static trac ? - archive.openwrt.org for old releases (no need to have old releases on ??? main dl server - BB and older) * servers ? - reuse old openwrt server as download/archive and/or buildserver ? - upgrade the HP servers ram with SPI donations ? - give more people access to the HP box (imre agreed to give felix full ??? root on the machine) ? - integrate zoltans boxes into the setup as build slaves * landing page ? - reuse lede-project page/wiki and add a owrt like theme ? - use same colour of openwrt.org and logo ? - swap welcome page and replace it with a remerge announcement ? - add a banner link for the announcement ? - after grace period of 4 weeks, remove the announcement and use welcome ??? page as default again ? - remove all facebook tracking * DNS ? - leave it on the hp machine for now as long as felix gets and keeps full ??? root access * more voters ? - send out an open invitation letter to try and attract new people * flattr ? - we have around 1100 euro in the donations account, fund to be ??? transfered to SPI * contact email addr ? - there will be a 1->N mail forwarder for contact@ as done with LEDE ? - there will be a 1->3 mail account for security issues, the security team will then handle incoming mails Thanks ??????? OpenWrt and LEDE team _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:49 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:49 +0100 Subject: [OpenWrt-Devel] [PATCH v4 0/8] merge: add OpenWrt branding Message-ID: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> 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 v3: - drop recipe in banner v4: - split patches Signed-off-by: Zoltan HERPAI Signed-off-by: Imre Kaloz Zoltan HERPAI (8): merge: base: update base-files and basic config merge: release/banner: drop release name and update banner merge: targets: update image generation and targets merge: ssid: update default ssid merge: packages: update branding in core packages merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch merge: uhttpd: update cert generation to match system defaults merge: etc: update remaining files Config.in | 2 +- Makefile | 2 +- README | 6 +++--- include/image-commands.mk | 6 +++--- include/image.mk | 2 +- include/prereq-build.mk | 2 +- include/version.mk | 12 ++---------- package/base-files/Makefile | 2 +- package/base-files/files/bin/config_generate | 10 +++++----- package/base-files/files/etc/banner | 18 ++++++++---------- package/base-files/files/etc/init.d/system | 2 +- .../base-files/files/lib/preinit/10_indicate_preinit | 2 +- package/base-files/image-config.in | 8 ++++---- package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- package/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 +- package/network/services/samba36/files/samba.config | 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- package/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 ++++++------ .../utils/busybox/patches/230-add_nslookup_lede.patch | 16 ++++++++-------- package/utils/ct-bugcheck/src/bugcheck.sh | 2 +- 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 ++-- target/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 | 2 +- 53 files changed, 114 insertions(+), 123 deletions(-) -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:50 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:50 +0100 Subject: [OpenWrt-Devel] [PATCH v4 1/8] merge: base: update base-files and basic config In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-2-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- Config.in | 2 +- Makefile | 2 +- README | 6 +++--- package/base-files/Makefile | 2 +- package/base-files/files/bin/config_generate | 10 +++++----- package/base-files/files/etc/init.d/system | 2 +- package/base-files/files/lib/preinit/10_indicate_preinit | 2 +- package/base-files/image-config.in | 8 ++++---- scripts/checkpatch.pl | 2 +- scripts/config/mconf.c | 2 +- 10 files changed, 19 insertions(+), 19 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 Community + http://www.openwrt.org diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e6c53e9..459573a 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. at system[0] add system system - set system. at system[-1].hostname='LEDE' + set system. at system[-1].hostname='OpenWrt' set system. at system[-1].timezone='UTC' set system. at system[-1].ttylogin='0' set system. at system[-1].log_size='64' @@ -233,10 +233,10 @@ generate_static_system() { set system.ntp='timeserver' set system.ntp.enabled='1' set system.ntp.enable_server='0' - add_list system.ntp.server='0.lede.pool.ntp.org' - add_list system.ntp.server='1.lede.pool.ntp.org' - add_list system.ntp.server='2.lede.pool.ntp.org' - add_list system.ntp.server='3.lede.pool.ntp.org' + add_list system.ntp.server='0.openwrt.pool.ntp.org' + add_list system.ntp.server='1.openwrt.pool.ntp.org' + add_list system.ntp.server='2.openwrt.pool.ntp.org' + add_list system.ntp.server='3.openwrt.pool.ntp.org' EOF if json_is_a system object; then diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system index 8c5f677..531aa8c 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..88ec50a 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. @@ -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/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" -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:51 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:51 +0100 Subject: [OpenWrt-Devel] [PATCH v4 2/8] merge: release/banner: drop release name and update banner In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-3-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- include/version.mk | 12 ++---------- package/base-files/files/etc/banner | 18 ++++++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/include/version.mk b/include/version.mk index 1a0d3c9..a869ed6 100644 --- a/include/version.mk +++ b/include/version.mk @@ -10,13 +10,10 @@ # REVISION:=x # SOURCE_DATE_EPOCH:=x -RELEASE:=Reboot - PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_BUG_URL \ CONFIG_VERSION_NUMBER \ CONFIG_VERSION_CODE \ - CONFIG_VERSION_NICK \ CONFIG_VERSION_REPO \ CONFIG_VERSION_DIST \ CONFIG_VERSION_MANUFACTURER \ @@ -36,18 +33,15 @@ VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) -VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) -VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) - VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) -VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE) +VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) -VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),LEDE) +VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt) VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL)) VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://lede-project.org/) @@ -93,8 +87,6 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ -e 's,%C,$(VERSION_CODE),g' \ -e 's,%c,\L$(subst $(space),_,$(VERSION_CODE)),g' \ - -e 's,%N,$(VERSION_NICK),g' \ - -e 's,%n,\L$(subst $(space),_,$(VERSION_NICK)),g' \ -e 's,%D,$(VERSION_DIST),g' \ -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ -e 's,%R,$(REVISION),g' \ diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner index 4ec646a..f3af3c0 100644 --- a/package/base-files/files/etc/banner +++ b/package/base-files/files/etc/banner @@ -1,10 +1,8 @@ - _________ - / /\ _ ___ ___ ___ - / LE / \ | | | __| \| __| - / DE / \ | |__| _|| |) | _| - /________/ LE \ |____|___|___/|___| lede-project.org - \ \ DE / - \ LE \ / ----------------------------------------------------------- - \ DE \ / %N (%V, %C) - \________\/ ----------------------------------------------------------- - + _______ ________ __ + | |.-----.-----.-----.| | | |.----.| |_ + | - || _ | -__| || | | || _|| _| + |_______|| __|_____|__|__||________||__| |____| + |__| W I R E L E S S F R E E D O M + ----------------------------------------------------- + %D %V, %C + ----------------------------------------------------- -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:52 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:52 +0100 Subject: [OpenWrt-Devel] [PATCH v4 3/8] merge: targets: update image generation and targets In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-4-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- include/image-commands.mk | 6 +++--- include/image.mk | 2 +- package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- scripts/brcmImage.pl | 2 +- scripts/qemustart | 12 ++++++------ target/imagebuilder/Config.in | 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 ++-- 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 +++--- 22 files changed, 49 insertions(+), 48 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 1ec5252..59526d4 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 96a8892..8c67083 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/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/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/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/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 b7689c2..5122880 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/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. -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:53 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:53 +0100 Subject: [OpenWrt-Devel] [PATCH v4 4/8] merge: ssid: update default ssid In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-5-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- package/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 ++-- target/linux/omap24xx/base-files/etc/config/wireless | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 144e49b..c9c98f1 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/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" -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:54 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:54 +0100 Subject: [OpenWrt-Devel] [PATCH v4 5/8] merge: packages: update branding in core packages In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-6-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- package/network/services/lldpd/files/lldpd.config | 2 +- package/network/services/lldpd/files/lldpd.init | 2 +- package/network/services/samba36/files/samba.config | 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- package/network/services/uhttpd/files/uhttpd.config | 2 +- package/network/utils/iproute2/Makefile | 2 +- package/utils/ct-bugcheck/src/bugcheck.sh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) 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. at 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/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/ct-bugcheck/src/bugcheck.sh b/package/utils/ct-bugcheck/src/bugcheck.sh index 85f70c5..389e10c 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 -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:55 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:55 +0100 Subject: [OpenWrt-Devel] [PATCH v4 6/8] merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-7-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- package/utils/busybox/Config-defaults.in | 4 ++-- package/utils/busybox/config/networking/Config.in | 12 ++++++------ .../utils/busybox/patches/230-add_nslookup_lede.patch | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) 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/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch index e394dfb..14c0e87 100644 --- a/package/utils/busybox/patches/230-add_nslookup_lede.patch +++ b/package/utils/busybox/patches/230-add_nslookup_lede.patch @@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + -+//config:config NSLOOKUP_LEDE -+//config: bool "nslookup_lede" ++//config:config NSLOOKUP_OPENWRT ++//config: bool "nslookup_openwrt" +//config: depends on !NSLOOKUP +//config: default y +//config: help +//config: nslookup is a tool to query Internet name servers (LEDE flavor). +//config: -+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS +//config: bool "Enable long options" +//config: default y -+//config: depends on NSLOOKUP_LEDE && LONG_OPTS ++//config: depends on NSLOOKUP_OPENWRT && LONG_OPTS +//config: help +//config: Support long options for the nslookup applet. + -+//applet:IF_NSLOOKUP_LEDE(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) ++//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP)) + -+//kbuild:lib-$(CONFIG_NSLOOKUP_LEDE) += nslookup_lede.o ++//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o + +//usage:#define nslookup_lede_trivial_usage +//usage: "[HOST] [SERVER]" @@ -753,7 +753,7 @@ Signed-off-by: Jo-Philipp Wich +} + + -+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS +static const char nslookup_longopts[] ALIGN1 = + "type\0" Required_argument "q" + "querytype\0" Required_argument "q" @@ -778,7 +778,7 @@ Signed-off-by: Jo-Philipp Wich + unsigned int types = 0; + HEADER *header; + -+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS ++#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS + applet_long_options = nslookup_longopts; +#endif + -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:56 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:56 +0100 Subject: [OpenWrt-Devel] [PATCH v4 7/8] merge: uhttpd: update cert generation to match system defaults In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-8-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- package/network/services/uhttpd/files/uhttpd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 6b8be1c..47270bc 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:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}" sync mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}" mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}" -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 7 03:45:57 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 7 Nov 2017 09:45:57 +0100 Subject: [OpenWrt-Devel] [PATCH v4 8/8] merge: etc: update remaining files In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <1510044357-3686-9-git-send-email-wigyori@uid0.hu> Signed-off-by: Zoltan HERPAI --- include/prereq-build.mk | 2 +- target/imagebuilder/files/repositories.conf | 2 +- target/toolchain/files/README.TOOLCHAIN | 2 +- toolchain/gcc/common.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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/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/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 f22b8ad..69214ac 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -54,7 +54,7 @@ endif PATCH_DIR=../patches/$(GCC_VERSION) BUGURL=http://www.lede-project.org/bugs/ -PKGVERSION=LEDE GCC $(PKG_VERSION) $(REVISION) +PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION) HOST_BUILD_PARALLEL:=1 -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From yszhou4tech at gmail.com Tue Nov 7 04:14:25 2017 From: yszhou4tech at gmail.com (Yousong Zhou) Date: Tue, 7 Nov 2017 17:14:25 +0800 Subject: [OpenWrt-Devel] [PATCH v4 2/8] merge: release/banner: drop release name and update banner In-Reply-To: <1510044357-3686-3-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> <1510044357-3686-3-git-send-email-wigyori@uid0.hu> Message-ID: On 7 November 2017 at 16:45, Zoltan HERPAI wrote: > Signed-off-by: Zoltan HERPAI > --- > include/version.mk | 12 ++---------- > package/base-files/files/etc/banner | 18 ++++++++---------- > 2 files changed, 10 insertions(+), 20 deletions(-) > > diff --git a/include/version.mk b/include/version.mk > index 1a0d3c9..a869ed6 100644 > --- a/include/version.mk > +++ b/include/version.mk > @@ -10,13 +10,10 @@ > # REVISION:=x > # SOURCE_DATE_EPOCH:=x > > -RELEASE:=Reboot > - > PKG_CONFIG_DEPENDS += \ > CONFIG_VERSION_BUG_URL \ > CONFIG_VERSION_NUMBER \ > CONFIG_VERSION_CODE \ > - CONFIG_VERSION_NICK \ we need to also remove it from package/base-files/image-config.in Regards, yousong _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zajec5 at gmail.com Tue Nov 7 06:02:53 2017 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Tue, 7 Nov 2017 12:02:53 +0100 Subject: [OpenWrt-Devel] [PATCH packages] rpcd-mod-lxc: add "info" ubus method (similar to the lxc-info) Message-ID: <20171107110253.31718-1-zajec5@gmail.com> From: Rafa? Mi?ecki This method allows getting basic info about a queried container. It's based on the lxc-info command-line tool. Example output: > ubus call lxc info '{ "name": "foo" }' { "name": "foo", "state": "RUNNING", "pid": 2946, "ips": [ "192.168.0.124" ] } Signed-off-by: Rafa? Mi?ecki --- utils/rpcd-mod-lxc/files/lxc.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/utils/rpcd-mod-lxc/files/lxc.c b/utils/rpcd-mod-lxc/files/lxc.c index 0d52f167..6db1b311 100644 --- a/utils/rpcd-mod-lxc/files/lxc.c +++ b/utils/rpcd-mod-lxc/files/lxc.c @@ -317,6 +317,48 @@ out: } static int +rpc_lxc_info(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct blob_attr *tb[__RPC_LXC_RENAME_MAX]; + struct rpc_lxc *l = NULL; + char **addresses; + void *k; + pid_t initpid; + + blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg)); + + l = rpc_lxc_init(tb); + if (!l) + return UBUS_STATUS_INVALID_ARGUMENT; + blob_buf_init(&buf, 0); + + blobmsg_add_string(&buf, "name", l->container->name); + + blobmsg_add_string(&buf, "state", l->container->state(l->container)); + + initpid = l->container->init_pid(l->container); + if (initpid >= 0) + blobmsg_add_u32(&buf, "pid", initpid); + + k = blobmsg_open_array(&buf, "ips"); + addresses = l->container->get_ips(l->container, NULL, NULL, 0); + if (addresses) { + int i; + + for (i = 0; addresses[i]; i++) + blobmsg_add_string(&buf, "ip", addresses[i]); + } + blobmsg_close_array(&buf, k); + + ubus_send_reply(ctx, req, buf.head); + rpc_lxc_done(l); + + return UBUS_STATUS_OK; +} + +static int rpc_lxc_rename(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -480,6 +522,7 @@ rpc_lxc_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) UBUS_METHOD("stop", rpc_lxc_stop, rpc_lxc_min_policy), UBUS_METHOD("freeze", rpc_lxc_freeze, rpc_lxc_min_policy), UBUS_METHOD("unfreeze", rpc_lxc_unfreeze, rpc_lxc_min_policy), + UBUS_METHOD("info", rpc_lxc_info, rpc_lxc_min_policy), UBUS_METHOD("rename", rpc_lxc_rename, rpc_lxc_rename_policy), UBUS_METHOD("create", rpc_lxc_create, rpc_lxc_create_policy), UBUS_METHOD("destroy", rpc_lxc_destroy, rpc_lxc_min_policy), -- 2.11.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From luka at openwrt.org Tue Nov 7 10:51:29 2017 From: luka at openwrt.org (Luka Perkov) Date: Tue, 7 Nov 2017 16:51:29 +0100 Subject: [OpenWrt-Devel] [PATCH packages] rpcd-mod-lxc: add "info" ubus method (similar to the lxc-info) In-Reply-To: <20171107110253.31718-1-zajec5@gmail.com> References: <20171107110253.31718-1-zajec5@gmail.com> Message-ID: <8EA2EC4C-7421-424B-8AED-A56A6E89B7B7@openwrt.org> > On Nov 7, 2017, at 12:02 PM, Rafa? Mi?ecki wrote: > > From: Rafa? Mi?ecki > > This method allows getting basic info about a queried container. It's > based on the lxc-info command-line tool. > > Example output: >> ubus call lxc info '{ "name": "foo" }' > { > "name": "foo", > "state": "RUNNING", > "pid": 2946, > "ips": [ > "192.168.0.124" > ] > } > > Signed-off-by: Rafa? Mi?ecki Approved-by: Luka Perkov > --- > utils/rpcd-mod-lxc/files/lxc.c | 43 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/utils/rpcd-mod-lxc/files/lxc.c b/utils/rpcd-mod-lxc/files/lxc.c > index 0d52f167..6db1b311 100644 > --- a/utils/rpcd-mod-lxc/files/lxc.c > +++ b/utils/rpcd-mod-lxc/files/lxc.c > @@ -317,6 +317,48 @@ out: > } > > static int > +rpc_lxc_info(struct ubus_context *ctx, struct ubus_object *obj, > + struct ubus_request_data *req, const char *method, > + struct blob_attr *msg) > +{ > + struct blob_attr *tb[__RPC_LXC_RENAME_MAX]; > + struct rpc_lxc *l = NULL; > + char **addresses; > + void *k; > + pid_t initpid; > + > + blobmsg_parse(rpc_lxc_min_policy, __RPC_LXC_MAX, tb, blob_data(msg), blob_len(msg)); > + > + l = rpc_lxc_init(tb); > + if (!l) > + return UBUS_STATUS_INVALID_ARGUMENT; > + blob_buf_init(&buf, 0); > + > + blobmsg_add_string(&buf, "name", l->container->name); > + > + blobmsg_add_string(&buf, "state", l->container->state(l->container)); > + > + initpid = l->container->init_pid(l->container); > + if (initpid >= 0) > + blobmsg_add_u32(&buf, "pid", initpid); > + > + k = blobmsg_open_array(&buf, "ips"); > + addresses = l->container->get_ips(l->container, NULL, NULL, 0); > + if (addresses) { > + int i; > + > + for (i = 0; addresses[i]; i++) > + blobmsg_add_string(&buf, "ip", addresses[i]); > + } > + blobmsg_close_array(&buf, k); > + > + ubus_send_reply(ctx, req, buf.head); > + rpc_lxc_done(l); > + > + return UBUS_STATUS_OK; > +} > + > +static int > rpc_lxc_rename(struct ubus_context *ctx, struct ubus_object *obj, > struct ubus_request_data *req, const char *method, > struct blob_attr *msg) > @@ -480,6 +522,7 @@ rpc_lxc_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) > UBUS_METHOD("stop", rpc_lxc_stop, rpc_lxc_min_policy), > UBUS_METHOD("freeze", rpc_lxc_freeze, rpc_lxc_min_policy), > UBUS_METHOD("unfreeze", rpc_lxc_unfreeze, rpc_lxc_min_policy), > + UBUS_METHOD("info", rpc_lxc_info, rpc_lxc_min_policy), > UBUS_METHOD("rename", rpc_lxc_rename, rpc_lxc_rename_policy), > UBUS_METHOD("create", rpc_lxc_create, rpc_lxc_create_policy), > UBUS_METHOD("destroy", rpc_lxc_destroy, rpc_lxc_min_policy), > -- > 2.11.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Tue Nov 7 15:34:42 2017 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Tue, 7 Nov 2017 21:34:42 +0100 Subject: [OpenWrt-Devel] [PATCH v4 0/8] merge: add OpenWrt branding In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: On 11/07/2017 09:45 AM, Zoltan HERPAI 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. > > v2: - dismiss bugtracker and forum change > - update uhttpd cert gen > - update banner > - update busybox NSLOOKUP patch > > v3: - drop recipe in banner > > v4: - split patches > > Signed-off-by: Zoltan HERPAI > Signed-off-by: Imre Kaloz > > > Zoltan HERPAI (8): > merge: base: update base-files and basic config > merge: release/banner: drop release name and update banner > merge: targets: update image generation and targets > merge: ssid: update default ssid > merge: packages: update branding in core packages > merge: busybox: update CONFIG_NSLOOKUP in busybox config and > respective patch > merge: uhttpd: update cert generation to match system defaults > merge: etc: update remaining files Acked-by: Hauke Mehrtens For all patches. > > Config.in | 2 +- > Makefile | 2 +- > README | 6 +++--- > include/image-commands.mk | 6 +++--- > include/image.mk | 2 +- > include/prereq-build.mk | 2 +- > include/version.mk | 12 ++---------- > package/base-files/Makefile | 2 +- > package/base-files/files/bin/config_generate | 10 +++++----- > package/base-files/files/etc/banner | 18 ++++++++---------- > package/base-files/files/etc/init.d/system | 2 +- > .../base-files/files/lib/preinit/10_indicate_preinit | 2 +- > package/base-files/image-config.in | 8 ++++---- > package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- > package/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 +- > package/network/services/samba36/files/samba.config | 4 ++-- > package/network/services/samba36/files/samba.init | 6 +++--- > package/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 ++++++------ > .../utils/busybox/patches/230-add_nslookup_lede.patch | 16 ++++++++-------- > package/utils/ct-bugcheck/src/bugcheck.sh | 2 +- > 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 ++-- > target/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 | 2 +- > 53 files changed, 114 insertions(+), 123 deletions(-) > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From nbd at nbd.name Wed Nov 8 12:20:09 2017 From: nbd at nbd.name (Felix Fietkau) Date: Wed, 8 Nov 2017 18:20:09 +0100 Subject: [OpenWrt-Devel] [PATCH v4 0/8] merge: add OpenWrt branding In-Reply-To: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> Message-ID: <61f3fc3a-54ae-9bc2-12e7-f9e66037e9ec@nbd.name> On 2017-11-07 09:45, Zoltan HERPAI 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. > > v2: - dismiss bugtracker and forum change > - update uhttpd cert gen > - update banner > - update busybox NSLOOKUP patch > > v3: - drop recipe in banner > > v4: - split patches > > Signed-off-by: Zoltan HERPAI > Signed-off-by: Imre Kaloz Merged to my staging tree, thanks. I will also look into turning a few more instances of 'OpenWrt' into $(VERSION_DIST) or something like that in the future. - Felix _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ajaygargnsit at gmail.com Wed Nov 8 12:52:21 2017 From: ajaygargnsit at gmail.com (Ajay Garg) Date: Wed, 8 Nov 2017 23:22:21 +0530 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: References: Message-ID: Experts, Waiting for your kind reply/replies. Thanks and Regards, Ajay On 7 Nov 2017 11:22 a.m., "Ajay Garg" wrote: > Hi All. > > I have been trying to build the toolchain+packages (especially openssl) > using openwrt, but have been unable to do so for a armv7-ar architecture. > > The processor on our SOC is > https://www.digikey.com/product-detail/en/microchip- > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > So, is there an (already existing) configuration (in "make menuconfig", or > otherwise) that builds everything (toolchain plus packages) for armv7-ar? > > > Will be grateful to listen from you experts. > > > Thanks and Regards, > Ajay > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From philipp_subx at redfish-solutions.com Wed Nov 8 13:07:54 2017 From: philipp_subx at redfish-solutions.com (Philip Prindeville) Date: Wed, 8 Nov 2017 11:07:54 -0700 Subject: [OpenWrt-Devel] [LEDE-DEV] glibc finally fixes /etc/resolv.conf handling In-Reply-To: <58FA5852-558A-4B09-B441-20C19C926C53@redfish-solutions.com> References: <58FA5852-558A-4B09-B441-20C19C926C53@redfish-solutions.com> Message-ID: <87AB0BE8-3EF5-465E-B43F-5352C474CE7F@redfish-solutions.com> Previous email was a little premature, but more news on the subject: https://sourceware.org/bugzilla/show_bug.cgi?id=984 from what I can tell, MUSL reads the resolv.conf file on every call to __lookup_name()? so it shouldn?t have this issue. Then again, it?s a problem that?s more likely to afflict clients (especially roaming WiFi clients) being an LEDE router than LEDE itself. -Philip > On Jul 3, 2017, at 2:04 PM, Philip Prindeville wrote: > > For everyone who has ever wondered why they need to stop and restart long running services when they move from one network to another (as is common for laptops using Wifi that are roaming around), this can be quite vexing. > > The reason was that /etc/resolv.conf would get rewritten by DHCP when you acquired a new DHCP lease, but programs which were running wouldn?t have sufficient knowledge to force the resolver to re-initialize itself (and arguably, they shouldn?t have to? it should just work). > > This FINALLY (after many years) got fixed today: > > https://sourceware.org/bugzilla/show_bug.cgi?id=984 > > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=aef16cc8a4c670036d45590877d411a97f01e0cd > > So, hopefully that will make life easier for people who support their WiFi users and will no longer have to say, ?Have you tried stopping and restarting the service?? > > https://www.youtube.com/watch?v=PtXtIivRRKQ > > Woot woot! > > -Philip _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From karlp at tweak.net.au Wed Nov 8 15:54:28 2017 From: karlp at tweak.net.au (Karl Palsson) Date: Wed, 08 Nov 2017 20:54:28 -0000 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: References: Message-ID: That part is armv7-m (not -a, not -r). They don't generally run linux at all, so don't have toolchains targetting linux, and don't generally have existing targets in openwrt. You _can_ run linux on them, but it's a farrrr bigger task than just, "which toolchain do I need to select in menuconfig" Cheers, Karl P Ajay Garg wrote: > Experts, > > Waiting for your kind reply/replies. > > > Thanks and Regards, > Ajay > > On 7 Nov 2017 11:22 a.m., "Ajay Garg" > wrote: > > > Hi All. > > > > I have been trying to build the toolchain+packages (especially openssl) > > using openwrt, but have been unable to do so for a armv7-ar architecture. > > > > The processor on our SOC is > > https://www.digikey.com/product-detail/en/microchip- > > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > > > So, is there an (already existing) configuration (in "make menuconfig", or > > otherwise) that builds everything (toolchain plus packages) for armv7-ar? > > > > > > Will be grateful to listen from you experts. > > > > > > Thanks and Regards, > > Ajay > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.html Type: application/pgp-signature Size: 1161 bytes Desc: OpenPGP Digital Signature URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From floring2502 at gmail.com Thu Nov 9 04:02:03 2017 From: floring2502 at gmail.com (Florin) Date: Thu, 9 Nov 2017 11:02:03 +0200 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: References: Message-ID: <003301d35939$6a276150$3e7623f0$@gmail.com> I've got a toolchain (gcc-4.9.2 + binutils-2.26.1) running on armv7-a and ipk packages compiled with/for it: floring at huawei:~$ gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/opt/usr/libexec/gcc/arm-linux-gnueabi/4.9.2/lto-wrapper Target: arm-linux-gnueabi Configured with: ../configure --host=arm-linux-gnueabi --target=arm-linux-gnueabi --prefix=/opt/usr --with-gmp=/opt/usr --with-mpfr=/opt/usr --with-mpc=/opt/usr --with-isl=/opt/usr --with-cloog=/opt/usr --enable-languages=c,c++,go,objc,obj-c++ --disable-multilib LDFLAGS_FOR_TARGET=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 LDFLAGS_FOR_HOST=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 LDFLAGS=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 Thread model: posix gcc version 4.9.2 (GCC) The architecture is a Huawei-ES880 (Cortex A9 without FPU) router running Zyxmon's DD-WRT mod for Northstar platforms. I've even been able to compile and run Xorg, GTK 2 and 3 and Qt 4.8.2 as optware on it, and I am currently working on upgrading gcc and "debianize" it. So I kinda run a complete linux on this architecture. I've started it from cross-compiling glibc and gcc and installing them on scratch /opt filesystem, and to simplify things I used some of Zyxmon's Qnapware (http://qnapware.zyxmon.org/binaries-armv7/); If you only need some essential packages, this link would be enough. I am doing it as a hobby, but my problem is that I don't have a large traffic subscription so I cannot make it largely public. If you need more than the packages in Qnapware, especially the native arm-v7a toolchain, then I could share my work. Keep in mind that these embedded systems have limited RAM so you need to setup at least 1GB of swap space and set TMPDIR variable on external HDD directory for making all these work. Florin > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] > On Behalf Of Karl Palsson > Sent: Wednesday, November 08, 2017 10:54 PM > To: Ajay Garg > Cc: openwrt-devel > Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? > > > That part is armv7-m (not -a, not -r). They don't generally run linux at all, so > don't have toolchains targetting linux, and don't generally have existing > targets in openwrt. > > You _can_ run linux on them, but it's a farrrr bigger task than just, "which > toolchain do I need to select in menuconfig" > > Cheers, > Karl P > > Ajay Garg wrote: > > Experts, > > > > Waiting for your kind reply/replies. > > > > > > Thanks and Regards, > > Ajay > > > > On 7 Nov 2017 11:22 a.m., "Ajay Garg" > > wrote: > > > > > Hi All. > > > > > > I have been trying to build the toolchain+packages (especially > > > openssl) using openwrt, but have been unable to do so for a armv7-ar > architecture. > > > > > > The processor on our SOC is > > > https://www.digikey.com/product-detail/en/microchip- > > > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > > > > > So, is there an (already existing) configuration (in "make > > > menuconfig", or > > > otherwise) that builds everything (toolchain plus packages) for armv7-ar? > > > > > > > > > Will be grateful to listen from you experts. > > > > > > > > > Thanks and Regards, > > > Ajay > > > > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel at lists.openwrt.org > > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ajaygargnsit at gmail.com Thu Nov 9 05:09:44 2017 From: ajaygargnsit at gmail.com (Ajay Garg) Date: Thu, 9 Nov 2017 15:39:44 +0530 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: <003301d35939$6a276150$3e7623f0$@gmail.com> References: <003301d35939$6a276150$3e7623f0$@gmail.com> Message-ID: Thanks Karl and Florin for the replies. Ok, so the first thing I need to understand is OpenWRT is for building linux(-like) systems (only) for routers .. thanks guys for this clearance. Florin, I'll tell you my usecase in a bit of detail. * We have a framework, with openssl-client code written. * We port our framework to multiple platforms/devices, and then link libcrypto.a and libssl.a as and when required. For the SOC with processor https://www.digikey.com/product-detail/en/microchip-technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758, everything has been done, but we are stuck on integrating openssl due to being unable to build compatible libcrypto.a and libssl.a for the same. I almost got things done by tweaking things with the "Freescale i.MX 6" configuration, but failed when I added the -mthumb option. Since then, I have been trying all sorts of things, to firstly build a toolchain (in ubuntu-14.04 host) supporting -mthumb, and then compile libcrypto.a and libssl.a for the same. So, if there is a (existing/available) toolchain in openwrt that would compile for armv7-a with -mthumb, I think all I need to do is go into packages/libs/openssl, and fire "make -B". Kindly let know if something can be done for the same. Once again, thanks everyone for the help so far ... looking forward to learning more from you experts.. Thanks and Regards, Ajay On Thu, Nov 9, 2017 at 2:32 PM, Florin wrote: > I've got a toolchain (gcc-4.9.2 + binutils-2.26.1) running on armv7-a and > ipk packages compiled with/for it: > > floring at huawei:~$ gcc -v > Using built-in specs. > COLLECT_GCC=gcc > COLLECT_LTO_WRAPPER=/opt/usr/libexec/gcc/arm-linux-gnueabi/ > 4.9.2/lto-wrapper > Target: arm-linux-gnueabi > Configured with: ../configure --host=arm-linux-gnueabi > --target=arm-linux-gnueabi --prefix=/opt/usr --with-gmp=/opt/usr > --with-mpfr=/opt/usr --with-mpc=/opt/usr --with-isl=/opt/usr > --with-cloog=/opt/usr --enable-languages=c,c++,go,objc,obj-c++ > --disable-multilib > LDFLAGS_FOR_TARGET=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > LDFLAGS_FOR_HOST=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > LDFLAGS=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > Thread model: posix > gcc version 4.9.2 (GCC) > > The architecture is a Huawei-ES880 (Cortex A9 without FPU) router running > Zyxmon's DD-WRT mod for Northstar platforms. I've even been able to compile > and run Xorg, GTK 2 and 3 and Qt 4.8.2 as optware on it, and I am > currently > working on upgrading gcc and "debianize" it. So I kinda run a complete > linux > on this architecture. > I've started it from cross-compiling glibc and gcc and installing them on > scratch /opt filesystem, and to simplify things I used some of Zyxmon's > Qnapware (http://qnapware.zyxmon.org/binaries-armv7/); If you only need > some > essential packages, this link would be enough. > > I am doing it as a hobby, but my problem is that I don't have a large > traffic subscription so I cannot make it largely public. If you need more > than the packages in Qnapware, especially the native arm-v7a toolchain, > then > I could share my work. Keep in mind that these embedded systems have > limited > RAM so you need to setup at least 1GB of swap space and set TMPDIR variable > on external HDD directory for making all these work. > > Florin > > > -----Original Message----- > > From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] > > On Behalf Of Karl Palsson > > Sent: Wednesday, November 08, 2017 10:54 PM > > To: Ajay Garg > > Cc: openwrt-devel > > Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? > > > > > > That part is armv7-m (not -a, not -r). They don't generally run linux at > all, so > > don't have toolchains targetting linux, and don't generally have existing > > targets in openwrt. > > > > You _can_ run linux on them, but it's a farrrr bigger task than just, > "which > > toolchain do I need to select in menuconfig" > > > > Cheers, > > Karl P > > > > Ajay Garg wrote: > > > Experts, > > > > > > Waiting for your kind reply/replies. > > > > > > > > > Thanks and Regards, > > > Ajay > > > > > > On 7 Nov 2017 11:22 a.m., "Ajay Garg" > > > wrote: > > > > > > > Hi All. > > > > > > > > I have been trying to build the toolchain+packages (especially > > > > openssl) using openwrt, but have been unable to do so for a armv7-ar > > architecture. > > > > > > > > The processor on our SOC is > > > > https://www.digikey.com/product-detail/en/microchip- > > > > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > > > > > > > So, is there an (already existing) configuration (in "make > > > > menuconfig", or > > > > otherwise) that builds everything (toolchain plus packages) for > armv7-ar? > > > > > > > > > > > > Will be grateful to listen from you experts. > > > > > > > > > > > > Thanks and Regards, > > > > Ajay > > > > > > > _______________________________________________ > > > openwrt-devel mailing list > > > openwrt-devel at lists.openwrt.org > > > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > > -- Regards, Ajay -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From floring2502 at gmail.com Thu Nov 9 06:25:05 2017 From: floring2502 at gmail.com (Florin) Date: Thu, 9 Nov 2017 13:25:05 +0200 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: References: <003301d35939$6a276150$3e7623f0$@gmail.com> Message-ID: <006901d3594d$6563f5c0$302be140$@gmail.com> Hi Ajay, There have been lots of discussions recently as OpenWrt is developing into LEDE, a linux for generic embedded systems, not only for routers. The Atmel Cortex M4 120Mhz will probably be very slow running my toolchain, especially if the RAM is only 512kB. My Cortex A9 is 800MHz and 128MB of RAM and runs pretty fast when setting 1GB of swap file o USB-3.0 HDD. First of all, which C library are you using, glibc or uclibc on your framework? I've built my toolchain specifically for glibc-2.20 with root filesystem residing on /opt. Since I've ported binutils-2.26.1 from Debian source, it will work with sysroots but gcc is not yet with sysroots enabled; I am going to enable it while upgrading to the latest gcc-4.9.4 from Debian source (the last gcc-4.9 to be supported); this time will also have gcj and OpenJDK running, but it's still work in progress (I am debianizing it and couldn't find out why libphobos compilation is never run by dpkg-build, although it is configured and doesn't give any error; - any Debian exprt knows about it? - ). Openssl is already available for this kind of optware, there is a version in the link I've sent you (but it's dynamic and should reside in /opt/lib). I have a more recent version myself, including the dev package with statically linked library, but you need to make sure the toolchain will work for you. Also, does your platform run opkg? If so, I can make a link for the essential packages for the toolchain to work and give them to you (they will install in /opt as stated above). Best wishes, Florin From: Ajay Garg [mailto:ajaygargnsit at gmail.com] Sent: Thursday, November 09, 2017 12:10 PM To: Florin Cc: Karl Palsson; openwrt-devel Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? Thanks Karl and Florin for the replies. Ok, so the first thing I need to understand is OpenWRT is for building linux(-like) systems (only) for routers .. thanks guys for this clearance. Florin, I'll tell you my usecase in a bit of detail. * We have a framework, with openssl-client code written. * We port our framework to multiple platforms/devices, and then link libcrypto.a and libssl.a as and when required. For the SOC with processor https://www.digikey.com/product-detail/en/microchip-technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758, everything has been done, but we are stuck on integrating openssl due to being unable to build compatible libcrypto.a and libssl.a for the same. I almost got things done by tweaking things with the "Freescale i.MX 6" configuration, but failed when I added the -mthumb option. Since then, I have been trying all sorts of things, to firstly build a toolchain (in ubuntu-14.04 host) supporting -mthumb, and then compile libcrypto.a and libssl.a for the same. So, if there is a (existing/available) toolchain in openwrt that would compile for armv7-a with -mthumb, I think all I need to do is go into packages/libs/openssl, and fire "make -B". Kindly let know if something can be done for the same. Once again, thanks everyone for the help so far ... looking forward to learning more from you experts.. Thanks and Regards, Ajay On Thu, Nov 9, 2017 at 2:32 PM, Florin wrote: I've got a toolchain (gcc-4.9.2 + binutils-2.26.1) running on armv7-a and ipk packages compiled with/for it: floring at huawei:~$ gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/opt/usr/libexec/gcc/arm-linux-gnueabi/4.9.2/lto-wrapper Target: arm-linux-gnueabi Configured with: ../configure --host=arm-linux-gnueabi --target=arm-linux-gnueabi --prefix=/opt/usr --with-gmp=/opt/usr --with-mpfr=/opt/usr --with-mpc=/opt/usr --with-isl=/opt/usr --with-cloog=/opt/usr --enable-languages=c,c++,go,objc,obj-c++ --disable-multilib LDFLAGS_FOR_TARGET=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 LDFLAGS_FOR_HOST=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 LDFLAGS=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 Thread model: posix gcc version 4.9.2 (GCC) The architecture is a Huawei-ES880 (Cortex A9 without FPU) router running Zyxmon's DD-WRT mod for Northstar platforms. I've even been able to compile and run Xorg, GTK 2 and 3 and Qt 4.8.2 as optware on it, and I am currently working on upgrading gcc and "debianize" it. So I kinda run a complete linux on this architecture. I've started it from cross-compiling glibc and gcc and installing them on scratch /opt filesystem, and to simplify things I used some of Zyxmon's Qnapware (http://qnapware.zyxmon.org/binaries-armv7/); If you only need some essential packages, this link would be enough. I am doing it as a hobby, but my problem is that I don't have a large traffic subscription so I cannot make it largely public. If you need more than the packages in Qnapware, especially the native arm-v7a toolchain, then I could share my work. Keep in mind that these embedded systems have limited RAM so you need to setup at least 1GB of swap space and set TMPDIR variable on external HDD directory for making all these work. Florin > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] > On Behalf Of Karl Palsson > Sent: Wednesday, November 08, 2017 10:54 PM > To: Ajay Garg > Cc: openwrt-devel > Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? > > > That part is armv7-m (not -a, not -r). They don't generally run linux at all, so > don't have toolchains targetting linux, and don't generally have existing > targets in openwrt. > > You _can_ run linux on them, but it's a farrrr bigger task than just, "which > toolchain do I need to select in menuconfig" > > Cheers, > Karl P > > Ajay Garg wrote: > > Experts, > > > > Waiting for your kind reply/replies. > > > > > > Thanks and Regards, > > Ajay > > > > On 7 Nov 2017 11:22 a.m., "Ajay Garg" > > wrote: > > > > > Hi All. > > > > > > I have been trying to build the toolchain+packages (especially > > > openssl) using openwrt, but have been unable to do so for a armv7-ar > architecture. > > > > > > The processor on our SOC is > > > https://www.digikey.com/product-detail/en/microchip- > > > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > > > > > So, is there an (already existing) configuration (in "make > > > menuconfig", or > > > otherwise) that builds everything (toolchain plus packages) for armv7-ar? > > > > > > > > > Will be grateful to listen from you experts. > > > > > > > > > Thanks and Regards, > > > Ajay > > > > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel at lists.openwrt.org > > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Regards, Ajay _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ajaygargnsit at gmail.com Thu Nov 9 06:56:56 2017 From: ajaygargnsit at gmail.com (Ajay Garg) Date: Thu, 9 Nov 2017 17:26:56 +0530 Subject: [OpenWrt-Devel] Toolchain for armv7-ar? In-Reply-To: <006901d3594d$6563f5c0$302be140$@gmail.com> References: <003301d35939$6a276150$3e7623f0$@gmail.com> <006901d3594d$6563f5c0$302be140$@gmail.com> Message-ID: Hi Florin. There is no (need of) filesystem on our SOC. Our software-framework is all in bare-metal C, and we simply compile it using the Atmel-Studio. We only are unable to obtain proper libcrypto.a and libssl.a, as a result of which we are unable to use openssl. Actually, I am sorry if I am using toolchain in the wrong sense. What we really need is to compile openssl for our processor, that's it (of course with a proper compiler that supports -mthumb), and generate libcrypto.a and libssl.a. We will then simply statically-link these two libraries with our framework, and (only) the required .o files from these two libraries will then be linked in the singular-binary (which we then obviously flash onto the SOC through JTAG). Thanks Florin for your quick help .... I am obliged .. Thanks and Regards, Ajay On Thu, Nov 9, 2017 at 4:55 PM, Florin wrote: > Hi Ajay, > > There have been lots of discussions recently as OpenWrt is developing into > LEDE, a linux for generic embedded systems, not only for routers. > The Atmel Cortex M4 120Mhz will probably be very slow running my > toolchain, especially if the RAM is only 512kB. My Cortex A9 is 800MHz and > 128MB of RAM and runs pretty fast when setting 1GB of swap file o USB-3.0 > HDD. > First of all, which C library are you using, glibc or uclibc on your > framework? I've built my toolchain specifically for glibc-2.20 with root > filesystem residing on /opt. Since I've ported binutils-2.26.1 from Debian > source, it will work with sysroots but gcc is not yet with sysroots > enabled; I am going to enable it while upgrading to the latest gcc-4.9.4 > from Debian source (the last gcc-4.9 to be supported); this time will also > have gcj and OpenJDK running, but it's still work in progress (I am > debianizing it and couldn't find out why libphobos compilation is never run > by dpkg-build, although it is configured and doesn't give any error; - any > Debian exprt knows about it? - ). > > Openssl is already available for this kind of optware, there is a version > in the link I've sent you (but it's dynamic and should reside in /opt/lib). > I have a more recent version myself, including the dev package with > statically linked library, but you need to make sure the toolchain will > work for you. > Also, does your platform run opkg? If so, I can make a link for the > essential packages for the toolchain to work and give them to you (they > will install in /opt as stated above). > > Best wishes, > Florin > > From: Ajay Garg [mailto:ajaygargnsit at gmail.com] > Sent: Thursday, November 09, 2017 12:10 PM > To: Florin > Cc: Karl Palsson; openwrt-devel > Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? > > Thanks Karl and Florin for the replies. > > Ok, so the first thing I need to understand is OpenWRT is for building > linux(-like) systems (only) for routers .. thanks guys for this clearance. > > Florin, > I'll tell you my usecase in a bit of detail. > * We have a framework, with openssl-client code written. > * We port our framework to multiple platforms/devices, and then link > libcrypto.a and libssl.a as and when required. > > For the SOC with processor https://www.digikey.com/ > product-detail/en/microchip-technology/ATSAM4E8CA-AUR/ > ATSAM4E8CA-AURCT-ND/4140758, everything has been done, but we are stuck > on integrating openssl due to being unable to build compatible libcrypto.a > and libssl.a for the same. > I almost got things done by tweaking things with the "Freescale i.MX 6" > configuration, but failed when I added the -mthumb option. > Since then, I have been trying all sorts of things, to firstly build a > toolchain (in ubuntu-14.04 host) supporting -mthumb, and then compile > libcrypto.a and libssl.a for the same. > So, if there is a (existing/available) toolchain in openwrt that would > compile for armv7-a with -mthumb, I think all I need to do is go into > packages/libs/openssl, and fire "make -B". Kindly let know if something can > be done for the same. > > Once again, thanks everyone for the help so far ... looking forward to > learning more from you experts.. > > Thanks and Regards, > Ajay > > > On Thu, Nov 9, 2017 at 2:32 PM, Florin wrote: > I've got a toolchain (gcc-4.9.2 + binutils-2.26.1) running on armv7-a and > ipk packages compiled with/for it: > > floring at huawei:~$ gcc -v > Using built-in specs. > COLLECT_GCC=gcc > COLLECT_LTO_WRAPPER=/opt/usr/libexec/gcc/arm-linux-gnueabi/ > 4.9.2/lto-wrapper > Target: arm-linux-gnueabi > Configured with: ../configure --host=arm-linux-gnueabi > --target=arm-linux-gnueabi --prefix=/opt/usr --with-gmp=/opt/usr > --with-mpfr=/opt/usr --with-mpc=/opt/usr --with-isl=/opt/usr > --with-cloog=/opt/usr --enable-languages=c,c++,go,objc,obj-c++ > --disable-multilib > LDFLAGS_FOR_TARGET=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > LDFLAGS_FOR_HOST=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > LDFLAGS=-Wl,--dynamic-linker=/opt/lib/ld-linux.so.3 > Thread model: posix > gcc version 4.9.2 (GCC) > > The architecture is a Huawei-ES880 (Cortex A9 without FPU) router running > Zyxmon's DD-WRT mod for Northstar platforms. I've even been able to compile > and run Xorg, GTK 2 and 3 and Qt 4.8.2 as optware on it, and I am > currently > working on upgrading gcc and "debianize" it. So I kinda run a complete > linux > on this architecture. > I've started it from cross-compiling glibc and gcc and installing them on > scratch /opt filesystem, and to simplify things I used some of Zyxmon's > Qnapware (http://qnapware.zyxmon.org/binaries-armv7/); If you only need > some > essential packages, this link would be enough. > > I am doing it as a hobby, but my problem is that I don't have a large > traffic subscription so I cannot make it largely public. If you need more > than the packages in Qnapware, especially the native arm-v7a toolchain, > then > I could share my work. Keep in mind that these embedded systems have > limited > RAM so you need to setup at least 1GB of swap space and set TMPDIR variable > on external HDD directory for making all these work. > > Florin > > > -----Original Message----- > > From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] > > On Behalf Of Karl Palsson > > Sent: Wednesday, November 08, 2017 10:54 PM > > To: Ajay Garg > > Cc: openwrt-devel > > Subject: Re: [OpenWrt-Devel] Toolchain for armv7-ar? > > > > > > That part is armv7-m (not -a, not -r). They don't generally run linux at > all, so > > don't have toolchains targetting linux, and don't generally have existing > > targets in openwrt. > > > > You _can_ run linux on them, but it's a farrrr bigger task than just, > "which > > toolchain do I need to select in menuconfig" > > > > Cheers, > > Karl P > > > > Ajay Garg wrote: > > > Experts, > > > > > > Waiting for your kind reply/replies. > > > > > > > > > Thanks and Regards, > > > Ajay > > > > > > On 7 Nov 2017 11:22 a.m., "Ajay Garg" > > > wrote: > > > > > > > Hi All. > > > > > > > > I have been trying to build the toolchain+packages (especially > > > > openssl) using openwrt, but have been unable to do so for a armv7-ar > > architecture. > > > > > > > > The processor on our SOC is > > > > https://www.digikey.com/product-detail/en/microchip- > > > > technology/ATSAM4E8CA-AUR/ATSAM4E8CA-AURCT-ND/4140758 > > > > > > > > So, is there an (already existing) configuration (in "make > > > > menuconfig", or > > > > otherwise) that builds everything (toolchain plus packages) for > armv7-ar? > > > > > > > > > > > > Will be grateful to listen from you experts. > > > > > > > > > > > > Thanks and Regards, > > > > Ajay > > > > > > > _______________________________________________ > > > openwrt-devel mailing list > > > openwrt-devel at lists.openwrt.org > > > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > > > > -- > Regards, > Ajay > > -- Regards, Ajay -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From valent at otvorenamreza.org Fri Nov 10 11:49:22 2017 From: valent at otvorenamreza.org (Valent Turkovic) Date: Fri, 10 Nov 2017 17:49:22 +0100 Subject: [OpenWrt-Devel] MeshPoint is one of the 12 finalists of Hackaday 2017! Message-ID: I'm proud to announce that MeshPoint has become one of the 12 finalists of The Hackaday Prize 2017. We?re competing for first place in two categories: Best Product and as best project overall. Without awesome work from OpenWrt and Lede maintainers and contributors we couldn't have done this. So a really big thanks to all of you! You have our deepest gratitude. Thanks to the hard work of MeshPoint team members, the collaborative project has gotten another confirmation that we are working on technology that?s going to make a significant impact on the IT industry and the humanitarian innovation sector. In the past months, we have been working hard to perfect our device?s efficiency, performance and appliance. Out of the 12 chosen finalists, 5 are selected to win 5,000 up to 50,000 USD. Honestly, just being selected as one of the best by leading IT experts, engineers, entrepreneurs and professors from reputable American universities (such as MIT) is great motivation and a clear message to our team that we?re on the right track. The announcement will be made on the Hackaday Superconference 2017, the largest international conference dedicated to open source hardware projects and hardware development. The conference starts on Saturday, 11th of November. The announcements will be made on: Saturday, 11th of November at 18:30 California time (Sunday 03:30 CET) You can follow the event live on the Hackaday Youtube channel or on the Hackaday Facebook page. Thanks to all MeshPoint team members: Milijana Micunovic (Crisis Innovation Lab), Valent Turkovic (Crisis Innovation Lab), Robert Marko, David Blazevic, Ivan Vidakovic (HexaWorx), Luka Perkov (Sartura), Davor Popovic (Sartura), Luka Mustafa (Institute IRNAS), Luka Simic, Marin Stevi?, Robert Sori? and David Zovko (e-radionica). _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From anton.ivanov at cambridgegreys.com Sat Nov 11 05:53:17 2017 From: anton.ivanov at cambridgegreys.com (Anton Ivanov) Date: Sat, 11 Nov 2017 10:53:17 +0000 Subject: [OpenWrt-Devel] Fwd: OpenWRT Build Process broken on recent Debian NFS In-Reply-To: References: Message-ID: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> Resend (apologies, tried to send it to -users by mistake initially). Hi all, I am observing an interesting issue with the OpenWRT build process when building on an up-to-date stretch host. It no longer works on NFS on debian (it used to work). If I run make with a clean freshly cloned directory tree on a normally mounted filesystem it completes OK. If I do a fresh git clone, mount the filesystem via nfs I get the following: SHELL= flock /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock -c '??? /var/autofs/local/src/openwrt/scripts/download.pl "/var/autofs/local/src/openwrt/dl" "patch-2.7.5.tar.xz" "e3da7940431633fb65a01b91d3b7a27a" "" "@GNU/patch"' flock: /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock: Bad file descriptor Makefile:23: recipe for target '/var/autofs/local/src/openwrt/dl/patch-2.7.5.tar.xz' failed The results are the same if I mount the system via autofs or directly via command line mount. If I run the flock statement "by hand" it completes OK as well so this happens only if it is invoked out of the openwrt build process (I smell a race here somewhere...). I wish I could pinpoint the exact moment it broke. However, as the actual problem is with downloads/stamps it is difficult to determine the actual point in time it stopped working. I tried running the build on a "pristine" stretch with no updates it was already broken so this most likely happened somewhere between jessie and stretch. Any ideas (I do not want to file a Debian bug before narrowing it down)? A. -- Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From lynxis at fe80.eu Sat Nov 11 19:08:22 2017 From: lynxis at fe80.eu (Alexander Couzens) Date: Sun, 12 Nov 2017 01:08:22 +0100 Subject: [OpenWrt-Devel] Fwd: OpenWRT Build Process broken on recent Debian NFS In-Reply-To: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> References: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> Message-ID: <20171112010433.2383e650@lazus.yip> On Sat, 11 Nov 2017 10:53:17 +0000 Anton Ivanov wrote: > SHELL= > flock /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock -c > '??? /var/autofs/local/src/openwrt/scripts/download.pl > "/var/autofs/local/src/openwrt/dl" "patch-2.7.5.tar.xz" > "e3da7940431633fb65a01b91d3b7a27a" "" "@GNU/patch"' > flock: /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock: > Bad file descriptor Makefile:23: recipe for target > '/var/autofs/local/src/openwrt/dl/patch-2.7.5.tar.xz' failed > > Any ideas (I do not want to file a Debian bug before narrowing it > down)? Hi Anton, the buildsystem will use it's own flock. Do you tried to use the flock produced by the build system? /var/autofs/local/src/openwrt/staging_dir/host/bin/flock best, lynxis -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 833 bytes Desc: OpenPGP digital signature URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From anton.ivanov at cambridgegreys.com Sun Nov 12 02:41:39 2017 From: anton.ivanov at cambridgegreys.com (Anton Ivanov) Date: Sun, 12 Nov 2017 07:41:39 +0000 Subject: [OpenWrt-Devel] Fwd: OpenWRT Build Process broken on recent Debian NFS In-Reply-To: <20171112010433.2383e650@lazus.yip> References: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> <20171112010433.2383e650@lazus.yip> Message-ID: <740a02bf-380e-99ad-e619-8068ad316ccd@cambridgegreys.com> On 12/11/17 00:08, Alexander Couzens wrote: > On Sat, 11 Nov 2017 10:53:17 +0000 > Anton Ivanov wrote: > >> SHELL= >> flock /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock -c >> '??? /var/autofs/local/src/openwrt/scripts/download.pl >> "/var/autofs/local/src/openwrt/dl" "patch-2.7.5.tar.xz" >> "e3da7940431633fb65a01b91d3b7a27a" "" "@GNU/patch"' >> flock: /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock: >> Bad file descriptor Makefile:23: recipe for target >> '/var/autofs/local/src/openwrt/dl/patch-2.7.5.tar.xz' failed >> >> Any ideas (I do not want to file a Debian bug before narrowing it >> down)? > Hi Anton, > > the buildsystem will use it's own flock. Do you tried to use the > flock produced by the build system? > > /var/autofs/local/src/openwrt/staging_dir/host/bin/flock cd /var/autofs/local/src/openwrt/ touch tmp/1 ; /var/autofs/local/src/openwrt/staging_dir/host/bin/flock tmp/1 -c "echo OK" ; rm tmp/1 /var/autofs/local/src/openwrt/staging_dir/host/bin/flock: tmp/1: Bad file descriptor Slightly better - it is now reproducible "by hand". /var/autofs/local/src/openwrt/staging_dir/host/bin/flock -V flock (util-linux-ng 2.18) I am still wondering what triggers it - it definitely worked fine in the past. A. > > best, > lynxis -- Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From dev at kresin.me Sun Nov 12 04:26:20 2017 From: dev at kresin.me (Mathias Kresin) Date: Sun, 12 Nov 2017 10:26:20 +0100 Subject: [OpenWrt-Devel] Fwd: OpenWRT Build Process broken on recent Debian NFS In-Reply-To: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> References: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> Message-ID: <6f885b71-4e8b-48db-35d9-e3c17ee9650c@kresin.me> 11.11.2017 11:53, Anton Ivanov: > Resend (apologies, tried to send it to -users by mistake initially). > > Hi all, > > I am observing an interesting issue with the OpenWRT build process when > building on an up-to-date stretch host. It no longer works on NFS on > debian (it used to work). > > If I run make with a clean freshly cloned directory tree on a normally > mounted filesystem it completes OK. If I do a fresh git clone, mount the > filesystem via nfs I get the following: > > SHELL= flock /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock > -c '??? /var/autofs/local/src/openwrt/scripts/download.pl > "/var/autofs/local/src/openwrt/dl" "patch-2.7.5.tar.xz" > "e3da7940431633fb65a01b91d3b7a27a" "" "@GNU/patch"' > flock: /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock: Bad > file descriptor > Makefile:23: recipe for target > '/var/autofs/local/src/openwrt/dl/patch-2.7.5.tar.xz' failed > > The results are the same if I mount the system via autofs or directly > via command line mount. If I run the flock statement "by hand" it > completes OK as well so this happens only if it is invoked out of the > openwrt build process (I smell a race here somewhere...). > > I wish I could pinpoint the exact moment it broke. However, as the > actual problem is with downloads/stamps it is difficult to determine the > actual point in time it stopped working. > > I tried running the build on a "pristine" stretch with no updates it was > already broken so this most likely happened somewhere between jessie and > stretch. > > Any ideas (I do not want to file a Debian bug before narrowing it down)? Please try again with the following patch applied: https://git.lede-project.org/5d0b180f798ca53cc04be4cec82c7c56b6c25d97 Mathias _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From anton.ivanov at cambridgegreys.com Sun Nov 12 13:23:53 2017 From: anton.ivanov at cambridgegreys.com (Anton Ivanov) Date: Sun, 12 Nov 2017 18:23:53 +0000 Subject: [OpenWrt-Devel] Fwd: OpenWRT Build Process broken on recent Debian NFS In-Reply-To: <6f885b71-4e8b-48db-35d9-e3c17ee9650c@kresin.me> References: <3a2102ca-1561-e934-a0cc-baad566af785@cambridgegreys.com> <6f885b71-4e8b-48db-35d9-e3c17ee9650c@kresin.me> Message-ID: It did not apply cleanly so I had to patch it by hand. Once patched by it worked fine. A. On 11/12/17 09:26, Mathias Kresin wrote: > 11.11.2017 11:53, Anton Ivanov: >> Resend (apologies, tried to send it to -users by mistake initially). >> >> Hi all, >> >> I am observing an interesting issue with the OpenWRT build process when >> building on an up-to-date stretch host. It no longer works on NFS on >> debian (it used to work). >> >> If I run make with a clean freshly cloned directory tree on a normally >> mounted filesystem it completes OK. If I do a fresh git clone, mount the >> filesystem via nfs I get the following: >> >> SHELL= flock /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock >> -c '??? /var/autofs/local/src/openwrt/scripts/download.pl >> "/var/autofs/local/src/openwrt/dl" "patch-2.7.5.tar.xz" >> "e3da7940431633fb65a01b91d3b7a27a" "" "@GNU/patch"' >> flock: /var/autofs/local/src/openwrt/tmp/.patch-2.7.5.tar.xz.flock: Bad >> file descriptor >> Makefile:23: recipe for target >> '/var/autofs/local/src/openwrt/dl/patch-2.7.5.tar.xz' failed >> >> The results are the same if I mount the system via autofs or directly >> via command line mount. If I run the flock statement "by hand" it >> completes OK as well so this happens only if it is invoked out of the >> openwrt build process (I smell a race here somewhere...). >> >> I wish I could pinpoint the exact moment it broke. However, as the >> actual problem is with downloads/stamps it is difficult to determine the >> actual point in time it stopped working. >> >> I tried running the build on a "pristine" stretch with no updates it was >> already broken so this most likely happened somewhere between jessie and >> stretch. >> >> Any ideas (I do not want to file a Debian bug before narrowing it down)? > > Please try again with the following patch applied: > https://git.lede-project.org/5d0b180f798ca53cc04be4cec82c7c56b6c25d97 > > Mathias > -- Anton R. Ivanov Cambridge Greys Limited, England and Wales company No 10273661 http://www.cambridgegreys.com/ _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zajec5 at gmail.com Tue Nov 14 07:14:24 2017 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Tue, 14 Nov 2017 13:14:24 +0100 Subject: [OpenWrt-Devel] [PATCH packages 1/2] shadow: use proper fix for checking subordinate IDs support Message-ID: <20171114121425.22676-1-zajec5@gmail.com> From: Rafa? Mi?ecki During 4.2.1 version update support for subordinate IDs has been disabled. It was handled by: 1) Adding --disable-subordinate-ids to avoid: configure: error: cannot run test program while cross compiling 2) Adding patch 003-fix-disabling-subids.patch to avoid: usermod.c: In function 'process_flags': usermod.c:1364:10: error: 'vflg' undeclared (first use in this function) if ( (vflg || Vflg) ^ This commit adds a patch with a proper configure.in fix. We don't need to disable subordinate IDs anymore. Signed-off-by: Rafa? Mi?ecki --- utils/shadow/Makefile | 5 ++-- ...-of-uid_t-and-gid_t-using-AC_CHECK_SIZEOF.patch | 35 ++++++++++++++++++++++ .../shadow/patches/003-fix-disabling-subids.patch | 32 -------------------- .../patches/004-fix-su-controoling-term.patch | 2 +- 4 files changed, 38 insertions(+), 36 deletions(-) create mode 100644 utils/shadow/patches/003-Check-size-of-uid_t-and-gid_t-using-AC_CHECK_SIZEOF.patch delete mode 100644 utils/shadow/patches/003-fix-disabling-subids.patch diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile index db9f7fb6..2cefe8b0 100644 --- a/utils/shadow/Makefile +++ b/utils/shadow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadow PKG_VERSION:=4.2.1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases @@ -37,8 +37,7 @@ CONFIGURE_ARGS += \ --without-acl \ --without-attr \ --without-tcb \ - --without-nscd \ - --disable-subordinate-ids \ + --without-nscd define Package/shadow/Default SECTION:=utils diff --git a/utils/shadow/patches/003-Check-size-of-uid_t-and-gid_t-using-AC_CHECK_SIZEOF.patch b/utils/shadow/patches/003-Check-size-of-uid_t-and-gid_t-using-AC_CHECK_SIZEOF.patch new file mode 100644 index 00000000..046523df --- /dev/null +++ b/utils/shadow/patches/003-Check-size-of-uid_t-and-gid_t-using-AC_CHECK_SIZEOF.patch @@ -0,0 +1,35 @@ +From 2cb54158b80cdbd97ca3b36df83f9255e923ae3f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 23 Aug 2014 09:46:39 +0100 +Subject: [PATCH] Check size of uid_t and gid_t using AC_CHECK_SIZEOF + +This built-in check is simpler than the previous method and, most +importantly, works when cross-compiling. + +Signed-off-by: Serge Hallyn +--- + configure.in | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +--- a/configure.in ++++ b/configure.in +@@ -334,16 +334,10 @@ if test "$enable_subids" != "no"; then + dnl + dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc + dnl +- AC_RUN_IFELSE([AC_LANG_SOURCE([ +-#include +-int main(void) { +- uid_t u; +- gid_t g; +- return (sizeof u < 4) || (sizeof g < 4); +-} +- ])], [id32bit="yes"], [id32bit="no"]) ++ AC_CHECK_SIZEOF([uid_t],, [#include "sys/types.h"]) ++ AC_CHECK_SIZEOF([gid_t],, [#include "sys/types.h"]) + +- if test "x$id32bit" = "xyes"; then ++ if test "$ac_cv_sizeof_uid_t" -ge 4 && test "$ac_cv_sizeof_gid_t" -ge 4; then + AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.]) + enable_subids="yes" + else diff --git a/utils/shadow/patches/003-fix-disabling-subids.patch b/utils/shadow/patches/003-fix-disabling-subids.patch deleted file mode 100644 index bbc65c7d..00000000 --- a/utils/shadow/patches/003-fix-disabling-subids.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/usermod.c -+++ b/src/usermod.c -@@ -1361,6 +1361,7 @@ static void process_flags (int argc, cha - exit (E_UID_IN_USE); - } - -+#ifdef ENABLE_SUBIDS - if ( (vflg || Vflg) - && !is_sub_uid) { - fprintf (stderr, -@@ -1376,6 +1377,7 @@ static void process_flags (int argc, cha - Prog, sub_gid_dbname (), "-w", "-W"); - exit (E_USAGE); - } -+#endif - } - - /* ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -52,7 +52,10 @@ usbin_PROGRAMS = \ - noinst_PROGRAMS = id sulogin - - suidbins = su --suidubins = chage chfn chsh expiry gpasswd newgrp passwd newuidmap newgidmap -+suidubins = chage chfn chsh expiry gpasswd newgrp passwd -+if ENABLE_SUBIDS -+ suidubins += newuidmap newgidmap -+endif - if ACCT_TOOLS_SETUID - suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod - endif diff --git a/utils/shadow/patches/004-fix-su-controoling-term.patch b/utils/shadow/patches/004-fix-su-controoling-term.patch index 4c130c73..2f7a670b 100644 --- a/utils/shadow/patches/004-fix-su-controoling-term.patch +++ b/utils/shadow/patches/004-fix-su-controoling-term.patch @@ -1,6 +1,6 @@ --- a/src/su.c +++ b/src/su.c -@@ -1090,8 +1090,12 @@ +@@ -1090,8 +1090,12 @@ int main (int argc, char **argv) if (fd >= 0) { err = ioctl (fd, TIOCNOTTY, (char *) 0); -- 2.11.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zajec5 at gmail.com Tue Nov 14 07:14:25 2017 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Tue, 14 Nov 2017 13:14:25 +0100 Subject: [OpenWrt-Devel] [PATCH packages 2/2] shadow: add packages for newgidmap and newuidmap applets In-Reply-To: <20171114121425.22676-1-zajec5@gmail.com> References: <20171114121425.22676-1-zajec5@gmail.com> Message-ID: <20171114121425.22676-2-zajec5@gmail.com> From: Rafa? Mi?ecki They are needed by LXC for unprivileged containers. Signed-off-by: Rafa? Mi?ecki --- utils/shadow/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/shadow/Makefile b/utils/shadow/Makefile index 2cefe8b0..3ab40d9a 100644 --- a/utils/shadow/Makefile +++ b/utils/shadow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadow PKG_VERSION:=4.2.1 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pkg-shadow.alioth.debian.org/releases @@ -27,7 +27,8 @@ include $(INCLUDE_DIR)/nls.mk SHADOW_APPLETS := \ chage chpasswd chfn chsh expiry faillog gpasswd \ groupadd groupdel groupmems groupmod groups \ - lastlog login newgrp nologin passwd su \ + lastlog login newgidmap newgrp newuidmap nologin \ + passwd su \ useradd userdel usermod vipw CONFIGURE_ARGS += \ -- 2.11.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From frodo at morgul.net Sat Nov 18 10:29:53 2017 From: frodo at morgul.net (Noah Meyerhans) Date: Sat, 18 Nov 2017 07:29:53 -0800 Subject: [OpenWrt-Devel] [remerge] summit meeting notes / roadmap In-Reply-To: <33f13505-d3e7-1799-e112-4ee56c047fc4@phrozen.org> References: <33f13505-d3e7-1799-e112-4ee56c047fc4@phrozen.org> Message-ID: <20171118152953.7n4xjpbivnoyus6d@ctrl.internal.morgul.net> Hi John. Thanks for sending this summary and working on the re-merge. I have a couple of questions based on your summary. I haven't tracked the remerge effort in detail, so please forgive me if these have already been covered. On Tue, Nov 07, 2017 at 09:38:12AM +0100, John Crispin wrote: > * Mailing-lists > ? There shall be 3 lists. All other lists that existed before/after the > ? reboot shall be shutdown. > ? - #openwrt - all contributions, patches, ideas, ... > ? - #openwrt-announce - new releases, security, ... > ? - #openwrt-org - admin foo Will there be a mechanism to notify users of security updates that they may need to apply? Some channel (e.g. a security-announce mailing list) for sending security advisories seems desirable. > * get onto the distro security ML > ? - http://oss-security.openwall.org/wiki/mailing-lists/distros Will OpenWRT's security support extend to the packages repository? If so, how will updates and disclosures be coordinated with package maintainers who may need to be involved in preparing an update? Thanks noah -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From shankar.unni+openwrt at gmail.com Wed Nov 22 13:14:32 2017 From: shankar.unni+openwrt at gmail.com (Shankar Unni) Date: Wed, 22 Nov 2017 10:14:32 -0800 Subject: [OpenWrt-Devel] State of Linux 4.14 in LEDE/OpenWrt? Message-ID: Just enquiring about the status of Linux 4.14 support for LEDE/OpenWrt, now that it's been released and gone into the LTS phase (i.e. is it being worked on by anyone currently?). Much thanks in advance, -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From anton.ivanov at cambridgegreys.com Thu Nov 23 13:47:42 2017 From: anton.ivanov at cambridgegreys.com (Anton Ivanov) Date: Thu, 23 Nov 2017 18:47:42 +0000 Subject: [OpenWrt-Devel] Fwd: [uml-devel] [GIT PULL] UML updates for 4.15-rc1 In-Reply-To: <3587814.WJtjhAiasP@blindfold> References: <3587814.WJtjhAiasP@blindfold> Message-ID: Hi All, I have a port of this patch-set for OpenWRT UML target. Speeds and feeds vary depending on the use case and topology from 1.5Gbit to >5Gbit. As a result of mine and Thomas Meyer earlier work for 4.4 qos should already work correctly too. I am happy to sort it out, contribute it and maintain it for as long as it is necessary. The question is what should I aim for when readying for submission: 4.4-stable as in OpenWRT tree or 4.14 as used in LEDE? Best Regards, A. -------- Forwarded Message -------- Subject: [uml-devel] [GIT PULL] UML updates for 4.15-rc1 Date: Thu, 23 Nov 2017 15:36:44 +0100 From: Richard Weinberger To: Linus CC: linux-kernel at vger.kernel.org, user-mode-linux-devel at lists.sourceforge.net Linus, The following changes since commit bebc6082da0a9f5d47a1ea2edc099bf671058bd4: Linux 4.14 (2017-11-12 10:46:13 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git for-linus-4.15-rc1 for you to fetch changes up to 02eb0b11eab56b47bcc36aa04dd522786c8faab9: um: Add missing EXPORT for free_irq_by_fd() (2017-11-22 15:20:56 +0100) ---------------------------------------------------------------- This pull request contains updates for UML: - A new and faster epoll based IRQ controller and NIC driver - Misc fixes and janitorial updates ---------------------------------------------------------------- Anton Ivanov (3): Epoll based IRQ controller High Performance UML Vector Network Driver um: Add missing EXPORT for free_irq_by_fd() Arnd Bergmann (1): um: time: Use timespec64 for persistent clock Geert Uytterhoeven (1): um: Restore symbol versions for __memcpy and memcpy Kees Cook (1): um: net: Convert timers to use timer_setup() Krzysztof Mazur (1): um: Use POSIX ucontext_t instead of struct ucontext arch/um/Kconfig.net | 11 + arch/um/drivers/Makefile | 4 +- arch/um/drivers/chan_kern.c | 53 +- arch/um/drivers/line.c | 2 +- arch/um/drivers/net_kern.c | 13 +- arch/um/drivers/random.c | 11 +- arch/um/drivers/ubd_kern.c | 4 +- arch/um/drivers/vector_kern.c | 1630 +++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 129 +++ arch/um/drivers/vector_transports.c | 458 ++++++++++ arch/um/drivers/vector_user.c | 586 ++++++++++++ arch/um/drivers/vector_user.h | 99 +++ arch/um/include/asm/asm-prototypes.h | 1 + arch/um/include/asm/irq.h | 12 + arch/um/include/shared/irq_user.h | 12 +- arch/um/include/shared/net_kern.h | 2 + arch/um/include/shared/os.h | 17 +- arch/um/kernel/irq.c | 461 ++++++---- arch/um/kernel/time.c | 6 +- arch/um/os-Linux/irq.c | 202 +++-- arch/um/os-Linux/signal.c | 2 +- arch/x86/um/stub_segv.c | 2 +- 22 files changed, 3387 insertions(+), 330 deletions(-) create mode 100644 arch/um/drivers/vector_kern.c create mode 100644 arch/um/drivers/vector_kern.h create mode 100644 arch/um/drivers/vector_transports.c create mode 100644 arch/um/drivers/vector_user.c create mode 100644 arch/um/drivers/vector_user.h create mode 100644 arch/um/include/asm/asm-prototypes.h ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel at lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Thu Nov 23 16:27:59 2017 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Thu, 23 Nov 2017 22:27:59 +0100 Subject: [OpenWrt-Devel] State of Linux 4.14 in LEDE/OpenWrt? In-Reply-To: References: Message-ID: On 11/22/2017 07:14 PM, Shankar Unni wrote: > Just enquiring about the status of Linux 4.14 support for LEDE/OpenWrt, > now that it's been released and gone into the LTS phase (i.e. is it > being worked on by anyone currently?). > > Much thanks in advance, Hi Shankar, I am currently working on kernel 4.14 support, but it is not in a state that it can be added to the master branch. You can find my branch here: https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.14 Hauke _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From anton.ivanov at cambridgegreys.com Thu Nov 23 16:34:24 2017 From: anton.ivanov at cambridgegreys.com (Anton Ivanov) Date: Thu, 23 Nov 2017 21:34:24 +0000 Subject: [OpenWrt-Devel] State of Linux 4.14 in LEDE/OpenWrt? In-Reply-To: References: Message-ID: <8fbca763-4e3b-1218-e99e-e23b62e7e1d3@cambridgegreys.com> Just to clarify - is the aim to switch to 4.14? If I need to submit patches should they be for 4.4 as in OpenWRT today? Or 4.14? Or both? A. On 23/11/17 21:27, Hauke Mehrtens wrote: > On 11/22/2017 07:14 PM, Shankar Unni wrote: >> Just enquiring about the status of Linux 4.14 support for LEDE/OpenWrt, >> now that it's been released and gone into the LTS phase (i.e. is it >> being worked on by anyone currently?). >> >> Much thanks in advance, > Hi Shankar, > > I am currently working on kernel 4.14 support, but it is not in a state > that it can be added to the master branch. > > You can find my branch here: > https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.14 > > Hauke > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Thu Nov 23 16:43:08 2017 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Thu, 23 Nov 2017 22:43:08 +0100 Subject: [OpenWrt-Devel] [remerge] summit meeting notes / roadmap In-Reply-To: <20171118152953.7n4xjpbivnoyus6d@ctrl.internal.morgul.net> References: <33f13505-d3e7-1799-e112-4ee56c047fc4@phrozen.org> <20171118152953.7n4xjpbivnoyus6d@ctrl.internal.morgul.net> Message-ID: <863fb384-6c73-d490-683b-c4b8bd5fcd56@hauke-m.de> On 11/18/2017 04:29 PM, Noah Meyerhans wrote: > Hi John. Thanks for sending this summary and working on the re-merge. I > have a couple of questions based on your summary. I haven't tracked the > remerge effort in detail, so please forgive me if these have already > been covered. > > On Tue, Nov 07, 2017 at 09:38:12AM +0100, John Crispin wrote: >> * Mailing-lists >> ? There shall be 3 lists. All other lists that existed before/after the >> ? reboot shall be shutdown. >> ? - #openwrt - all contributions, patches, ideas, ... >> ? - #openwrt-announce - new releases, security, ... >> ? - #openwrt-org - admin foo > > Will there be a mechanism to notify users of security updates that they > may need to apply? Some channel (e.g. a security-announce mailing list) > for sending security advisories seems desirable. #openwrt-announce would be used to announce new releases and security updates. > >> * get onto the distro security ML >> ? - http://oss-security.openwall.org/wiki/mailing-lists/distros > > Will OpenWRT's security support extend to the packages repository? If > so, how will updates and disclosures be coordinated with package > maintainers who may need to be involved in preparing an update? I think we haven't planned that in that detail. We just would like to get informed earlier about security problems like the KRACK attack. Probably 2 or 3 people will be on this mailing list and inform the person maintain the component that he should prepare a security update, but as far as I know there is not detailed plan. Hauke -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 858 bytes Desc: OpenPGP digital signature URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Mon Nov 27 05:31:36 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Mon, 27 Nov 2017 11:31:36 +0100 Subject: [OpenWrt-Devel] [LEDE-DEV] [PATCH v4 0/8] merge: add OpenWrt branding In-Reply-To: <61f3fc3a-54ae-9bc2-12e7-f9e66037e9ec@nbd.name> References: <1510044357-3686-1-git-send-email-wigyori@uid0.hu> <61f3fc3a-54ae-9bc2-12e7-f9e66037e9ec@nbd.name> Message-ID: <5A1BE988.8020907@uid0.hu> Felix Fietkau wrote: > On 2017-11-07 09:45, Zoltan HERPAI 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. >> >> v2: - dismiss bugtracker and forum change >> - update uhttpd cert gen >> - update banner >> - update busybox NSLOOKUP patch >> >> v3: - drop recipe in banner >> >> v4: - split patches >> >> Signed-off-by: Zoltan HERPAI >> Signed-off-by: Imre Kaloz >> > Merged to my staging tree, thanks. I will also look into turning a few > more instances of 'OpenWrt' into $(VERSION_DIST) or something like that > in the future. > Hi Felix, When should we proceed with the infra merge - and then merge these commits into master? I was waiting for a follow-up from You or Hauke. Thanks, Zoltan H _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From yvsg.phanis at gmail.com Mon Nov 27 16:03:45 2017 From: yvsg.phanis at gmail.com (Phani Siriki) Date: Mon, 27 Nov 2017 15:03:45 -0600 Subject: [OpenWrt-Devel] Building own kernel in OpenWRT Message-ID: Dear All I want to change the linux kernel in my OpenWrt build. I made changes to the kernel and committed to my github account. Could someone let me know the makefiles I need to change to get the kernel of my own? Thanks in Advance. Best Regards Phani -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ab at andi95.de Mon Nov 27 17:14:11 2017 From: ab at andi95.de (=?utf-8?Q?Andreas_Br=C3=A4u?=) Date: Mon, 27 Nov 2017 23:14:11 +0100 Subject: [OpenWrt-Devel] [WLANnews] Ideas wanted for Google Summer of Code 2018 In-Reply-To: References: Message-ID: today I finished the work on the deployment process of the new projects portal. So feel free to add your ideas now. We need them until the beginning of January: https://github.com/freifunk/projects.freifunk.net-contents Thank you, Andi > Am 22.11.2017 um 00:22 schrieb Andreas Br?u : > > Hi there, > > GSoC 2017 is barely over, GSoC 2018 will start soon. Next year the application period is earlier than the last years. So we need to start collecting ideas earlier, too. > > To improve the presentation of our ideas, I?d like to use a new software: https://projects.freifunk.net/ The tool was introduced and showed at the mentors summit by Coala. > It changes the way of adding ideas, it has to be done via GitHub: https://github.com/freifunk/projects.freifunk.net-contents > > What do you think about this? Should we use that instead of our wiki page? > > I?ll add an automatic deployment within the next days, so your ideas will be deployed after a commit to the repository. > > Best, > > Andi > > ? > Andreas Br?u > > XMPP: andibraeu at jabber.weimarnetz.de > Twitter: @evAltenberga > Blog: https://blog.andi95.de > PGP: 0xB7E04818 > > _______________________________________________ > WLANnews mailing list > WLANnews at freifunk.net > Abonnement abbestellen? -> http://lists.freifunk.net/mailman/listinfo/wlannews-freifunk.net > > Weitere Infos zu den freifunk.net Mailinglisten und zur An- und Abmeldung unter http://freifunk.net/mailinglisten -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: Message signed with OpenPGP URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From shankar.unni+openwrt at gmail.com Mon Nov 27 20:16:06 2017 From: shankar.unni+openwrt at gmail.com (Shankar Unni) Date: Mon, 27 Nov 2017 17:16:06 -0800 Subject: [OpenWrt-Devel] State of Linux 4.14 in LEDE/OpenWrt? In-Reply-To: References: Message-ID: Thank you. I just wanted to look at the scope of the work, and perhaps play with a copy of the current work in progress to get a feel for it. I'm in no particular hurry to see the results in master - so whenever it is ready is great. Thanks again! On Thu, Nov 23, 2017 at 1:27 PM, Hauke Mehrtens wrote: > On 11/22/2017 07:14 PM, Shankar Unni wrote: > > Just enquiring about the status of Linux 4.14 support for LEDE/OpenWrt, > > now that it's been released and gone into the LTS phase (i.e. is it > > being worked on by anyone currently?). > > > > Much thanks in advance, > > Hi Shankar, > > I am currently working on kernel 4.14 support, but it is not in a state > that it can be added to the master branch. > > You can find my branch here: > https://git.lede-project.org/?p=lede/hauke/staging.git;a= > shortlog;h=refs/heads/kernel-4.14 > > Hauke > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ronaldo at ronaldoafonso.com.br Tue Nov 28 06:16:50 2017 From: ronaldo at ronaldoafonso.com.br (Ronaldo Afonso) Date: Tue, 28 Nov 2017 09:16:50 -0200 Subject: [OpenWrt-Devel] Building own kernel in OpenWRT In-Reply-To: References: Message-ID: Hi Phani, Take a look at the "make kernel_menuconfig" or this link: https://wiki.openwrt.org/doc/howto/build#kernel_configuration_optional Regards ... 2017-11-27 19:03 GMT-02:00 Phani Siriki : > Dear All > > I want to change the linux kernel in my OpenWrt build. > > I made changes to the kernel and committed to my github account. > > Could someone let me know the makefiles I need to change to get the kernel > of my own? > > Thanks in Advance. > > Best Regards > Phani > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > > -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ronaldo at ronaldoafonso.com.br Tue Nov 28 09:20:16 2017 From: ronaldo at ronaldoafonso.com.br (Ronaldo Afonso) Date: Tue, 28 Nov 2017 12:20:16 -0200 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer Message-ID: Hi all, What does it take for a commit to be merged into a stable branch? The thing is ... I really would like to have TL-WR842N Hardware version 3 running on CC. I noticed that this hardware is already working on trunk (master) since last year but not merged into CC yet. How can I help that merge being done? Thanks in advance. -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From wigyori at uid0.hu Tue Nov 28 09:38:29 2017 From: wigyori at uid0.hu (Zoltan HERPAI) Date: Tue, 28 Nov 2017 15:38:29 +0100 (CET) Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: On Tue, 28 Nov 2017, Ronaldo Afonso wrote: > ? Hi all, > > ? What does it take for a commit to be merged into a stable branch? > > ? The thing is ... I really would like to have TL-WR842N Hardware version 3 running on CC. I noticed that this hardware is already working on trunk (master) since > last year but not merged into CC yet. > > ? How can I help that merge being done? > > ? Thanks in advance. You can try to merge this commit [1] into CC, test it out and open a pull-request on github against the chaos_calmer branch - expect some differences that'll need to be worked out manually in image/Makefile. (If you run into problems let me know and will try to help.) Thanks, -w- [1] https://github.com/openwrt/openwrt/commit/d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2 -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ronaldo at ronaldoafonso.com.br Tue Nov 28 14:24:56 2017 From: ronaldo at ronaldoafonso.com.br (Ronaldo Afonso) Date: Tue, 28 Nov 2017 17:24:56 -0200 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: Hi Zoltan, First of all, thanks for you replay. Following is what I have tried to to: 1) I tried doing a simple "git merge d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2" ... but that resulted in a LOT of errors. 2) So, I decided to look more closely at the commit and manually ported what had being done. Following is the git status and git diff on the CC branch ... ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git status On branch chaos_calmer Your branch is up-to-date with 'origin/chaos_calmer'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: target/linux/ar71xx/base-files/etc/diag.sh modified: target/linux/ar71xx/base-files/etc/uci-defaults/01_leds modified: target/linux/ar71xx/base-files/etc/uci-defaults/02_network modified: target/linux/ar71xx/base-files/lib/ar71xx.sh modified: target/linux/ar71xx/base-files/lib/upgrade/platform.sh modified: target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c modified: target/linux/ar71xx/image/Makefile modified: target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch no changes added to commit (use "git add" and/or "git commit -a") ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git diff diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 623e2a43b5..85f1e3eab6 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -280,6 +280,7 @@ get_status_led() { tl-wr841n-v11 | \ tl-wa830re-v2 | \ tl-wr842n-v2 | \ + tl-wr841n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5) status_led="tp-link:green:system" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 91f5875c2f..03f01c4050 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -519,6 +519,16 @@ tl-wr842n-v2) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" ;; +tl-wr842n-v3) + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" + ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" + ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" + ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" + ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" + ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" + ;; + tl-wa801nd-v2 | \ tl-wa901nd-v3) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 032c671341..0558c0f33d 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -439,6 +439,7 @@ tl-wr741nd |\ tl-wr741nd-v4 |\ tl-wr841n-v7 |\ tl-wr841n-v9 |\ +tl-wr842n-v3 |\ tl-wr841n-v11 |\ whr-g301n |\ whr-hp-g300n |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 1eb6999908..904ff4b10f 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -821,6 +821,9 @@ ar71xx_board_detect() { *"TL-WR842N/ND v2") name="tl-wr842n-v2" ;; + *"TL-WR842N/ND v3") + name="tl-wr842n-v3" + ;; *TL-WR941ND) name="tl-wr941nd" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index fda7bc417c..bf1e0d295e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -361,6 +361,7 @@ platform_check_image() { tl-wr841n-v9 | \ tl-wr841n-v11 | \ tl-wr842n-v2 | \ + tl-wr842n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5 | \ tl-wr941nd-v6 | \ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c index 004f719613..f33ca2c906 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c @@ -1,5 +1,5 @@ /* - * TP-LINK TL-WR841N/ND v9/v11 + * TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 * * Copyright (C) 2014 Matthias Schiffer * Copyright (C) 2016 Cezary Jackiewicz @@ -36,6 +36,20 @@ #define TL_WR841NV9_GPIO_BTN_RESET 12 #define TL_WR841NV9_GPIO_BTN_WIFI 17 +#define TL_WR842NV3_GPIO_LED_SYSTEM 2 +#define TL_WR842NV3_GPIO_LED_WLAN 3 +#define TL_WR842NV3_GPIO_LED_WAN_RED 4 +#define TL_WR842NV3_GPIO_LED_WAN_GREEN 11 +#define TL_WR842NV3_GPIO_LED_LAN1 12 +#define TL_WR842NV3_GPIO_LED_LAN2 13 +#define TL_WR842NV3_GPIO_LED_LAN3 14 +#define TL_WR842NV3_GPIO_LED_LAN4 15 +#define TL_WR842NV3_GPIO_LED_3G 16 +#define TL_WR842NV3_GPIO_LED_WPS 17 + +#define TL_WR842NV3_GPIO_BTN_RESET 1 +#define TL_WR842NV3_GPIO_BTN_WIFI 0 + #define TL_WR841NV11_GPIO_LED_SYSTEM 1 #define TL_WR841NV11_GPIO_LED_QSS 3 #define TL_WR841NV11_GPIO_LED_WAN 4 @@ -111,6 +125,68 @@ static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = { } }; +static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = { + { + .name = "tp-link:green:lan1", + .gpio = TL_WR842NV3_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "tp-link:green:lan2", + .gpio = TL_WR842NV3_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "tp-link:green:lan3", + .gpio = TL_WR842NV3_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "tp-link:green:lan4", + .gpio = TL_WR842NV3_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "tp-link:green:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "tp-link:red:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_RED, + .active_low = 1, + }, { + .name = "tp-link:green:wlan", + .gpio = TL_WR842NV3_GPIO_LED_WLAN, + .active_low = 1, + }, { + .name = "tp-link:green:system", + .gpio = TL_WR842NV3_GPIO_LED_SYSTEM, + .active_low = 1, + }, { + .name = "tp-link:green:3g", + .gpio = TL_WR842NV3_GPIO_LED_3G, + .active_low = 1, + }, { + .name = "tp-link:green:wps", + .gpio = TL_WR842NV3_GPIO_LED_WPS, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_RESET, + .active_low = 1, + }, { + .desc = "WIFI button", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_WIFI, + .active_low = 1, + } +}; + static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = { { .name = "tp-link:green:lan1", @@ -183,6 +259,24 @@ static void __init tl_ap143_setup(void) ath79_register_wmac(ee, tmpmac); } + +static void __init tl_wr842n_v3_setup(void) +{ + tl_ap143_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v3_leds_gpio), + tl_wr842n_v3_leds_gpio); + + ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_wr842n_v3_gpio_keys), + tl_wr842n_v3_gpio_keys); + + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", + tl_wr842n_v3_setup); + static void __init tl_wr841n_v9_setup(void) { tl_ap143_setup(); diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 6cbaf380d9..dbe5981c12 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -590,6 +590,13 @@ define Device/tl-wr842n-v2 TPLINK_HWID := 0x8420002 endef +define Device/tl-wr842n-v3 + $(Device/tplink-16mlzma) + BOARDNAME := TL-WR842N-v3 + DEVICE_PROFILE := TLWR842 + TPLINK_HWID := 0x08420003 +endef + define Device/tl-wr843nd-v1 $(Device/tplink-4mlzma) BOARDNAME := TL-WR841N-v8 @@ -603,7 +610,7 @@ define Device/tl-wr847n-v8 DEVICE_PROFILE := TLWR841 TPLINK_HWID := 0x08470008 endef -TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 +TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr842n-v3 tl-wr843nd-v1 tl-wr847n-v8 define Device/tl-wr941nd-v5 $(Device/tplink-4mlzma) diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index 99e96aaf72..1a378b034d 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1252,7 +1252,7 @@ + select ATH79_DEV_WMAC + +config ATH79_MACH_TL_WR841N_V9 -+ bool "TP-LINK TL-WR841N/ND v9 support" ++ bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support" + select SOC_QCA953X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS And when trying to build the image I got the following error message: echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/metadata.pl kconfig /home/ronaldo/Linux/OpenWrt/src/openwrt/tmp/.packageinfo /home/ronaldo/Linux/OpenWrt/src/openwrt/.config 3.18 > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/kconfig.pl 'm+' '+' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /dev/null /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config mv /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old grep -v INITRAMFS /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config echo 'CONFIG_INITRAMFS_SOURCE=""' >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config rm -rf /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/modules export MAKEFLAGS= ; [ -d /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers ] || make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" INSTALL_HDR_PATH=/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers headers_install . /home/ronaldo/Linux/OpenWrt/src/openwrt/include/shell.sh; grep '=[ym]' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config | LC_ALL=C sort | md5s > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.vermagic touch /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.configured rm -f /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/root-ar71xx/init make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" all modules make[5]: Entering directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' scripts/kconfig/conf --silentoldconfig Kconfig net/sched/Kconfig:43: warning: menuconfig statement without prompt # # configuration written to .config # CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/mips/ath79/mach-tl-wr841n-v9.o In file included from arch/mips/ath79/machtypes.h:15:0, from arch/mips/ath79/mach-tl-wr841n-v9.c:26: arch/mips/ath79/mach-tl-wr841n-v9.c:277:14: error: ''' undeclared here (not in a function) MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", ^ ./arch/mips/include/asm/mips_machine.h:33:15: note: in definition of macro 'MIPS_MACHINE' .mach_type = _type, \ ^ scripts/Makefile.build:257: recipe for target 'arch/mips/ath79/mach-tl-wr841n-v9.o' failed make[7]: *** [arch/mips/ath79/mach-tl-wr841n-v9.o] Error 1 scripts/Makefile.build:402: recipe for target 'arch/mips/ath79' failed make[6]: *** [arch/mips/ath79] Error 2 Makefile:944: recipe for target 'arch/mips' failed make[5]: *** [arch/mips] Error 2 make[5]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' Makefile:24: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image' failed make[4]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image] Error 2 make[4]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux/ar71xx' Makefile:13: recipe for target 'install' failed make[3]: *** [install] Error 2 make[3]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux' target/Makefile:21: recipe for target 'target/linux/install' failed make[2]: *** [target/linux/install] Error 2 make[2]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' target/Makefile:17: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install' failed make[1]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install] Error 2 make[1]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' /home/ronaldo/Linux/OpenWrt/src/openwrt/include/toplevel.mk:181: recipe for target 'world' failed make: *** [world] Error 2 So, it seems that I have to create a patch that incluces 'ATH79_MACH_TL_WR842N_V3' in the file 'arch/mips/ath79/machtypes.h'. Does it make any sense? Am I in the right direction? Can you please help me with that? Thanks ... 2017-11-28 12:38 GMT-02:00 Zoltan HERPAI : > On Tue, 28 Nov 2017, Ronaldo Afonso wrote: > > Hi all, >> >> What does it take for a commit to be merged into a stable branch? >> >> The thing is ... I really would like to have TL-WR842N Hardware version >> 3 running on CC. I noticed that this hardware is already working on trunk >> (master) since >> last year but not merged into CC yet. >> >> How can I help that merge being done? >> >> Thanks in advance. >> > > You can try to merge this commit [1] into CC, test it out and open a > pull-request on github against the chaos_calmer branch - expect some > differences that'll need to be worked out manually in image/Makefile. (If > you run into problems let me know and will try to help.) > > Thanks, > -w- > > [1] https://github.com/openwrt/openwrt/commit/d42ccc9f28aca96bdd > 7c83cfac43ae81d24bc5a2 > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > > -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From tmo26 at gmx.de Tue Nov 28 15:35:01 2017 From: tmo26 at gmx.de (Thomas Endt) Date: Tue, 28 Nov 2017 21:35:01 +0100 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: <000b01d36888$5e3244b0$1a96ce10$@de> This might be of interest: https://git.lede-project.org/?p=source.git;a=commit;h=0b45bec22c59cc6e6b2fa71dc9a88386c5587132 Von: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] Im Auftrag von Ronaldo Afonso Gesendet: Dienstag, 28. November 2017 20:25 An: Zoltan HERPAI Cc: OpenWrt Development List Betreff: Re: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer Hi Zoltan, First of all, thanks for you replay. Following is what I have tried to to: 1) I tried doing a simple "git merge d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2" ... but that resulted in a LOT of errors. 2) So, I decided to look more closely at the commit and manually ported what had being done. Following is the git status and git diff on the CC branch ... ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git status On branch chaos_calmer Your branch is up-to-date with 'origin/chaos_calmer'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: target/linux/ar71xx/base-files/etc/diag.sh modified: target/linux/ar71xx/base-files/etc/uci-defaults/01_leds modified: target/linux/ar71xx/base-files/etc/uci-defaults/02_network modified: target/linux/ar71xx/base-files/lib/ar71xx.sh modified: target/linux/ar71xx/base-files/lib/upgrade/platform.sh modified: target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c modified: target/linux/ar71xx/image/Makefile modified: target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch no changes added to commit (use "git add" and/or "git commit -a") ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git diff diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 623e2a43b5..85f1e3eab6 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -280,6 +280,7 @@ get_status_led() { tl-wr841n-v11 | \ tl-wa830re-v2 | \ tl-wr842n-v2 | \ + tl-wr841n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5) status_led="tp-link:green:system" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 91f5875c2f..03f01c4050 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -519,6 +519,16 @@ tl-wr842n-v2) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" ;; +tl-wr842n-v3) + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" + ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" + ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" + ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" + ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" + ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" + ;; + tl-wa801nd-v2 | \ tl-wa901nd-v3) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 032c671341..0558c0f33d 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -439,6 +439,7 @@ tl-wr741nd |\ tl-wr741nd-v4 |\ tl-wr841n-v7 |\ tl-wr841n-v9 |\ +tl-wr842n-v3 |\ tl-wr841n-v11 |\ whr-g301n |\ whr-hp-g300n |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 1eb6999908..904ff4b10f 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -821,6 +821,9 @@ ar71xx_board_detect() { *"TL-WR842N/ND v2") name="tl-wr842n-v2" ;; + *"TL-WR842N/ND v3") + name="tl-wr842n-v3" + ;; *TL-WR941ND) name="tl-wr941nd" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index fda7bc417c..bf1e0d295e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -361,6 +361,7 @@ platform_check_image() { tl-wr841n-v9 | \ tl-wr841n-v11 | \ tl-wr842n-v2 | \ + tl-wr842n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5 | \ tl-wr941nd-v6 | \ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c index 004f719613..f33ca2c906 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c @@ -1,5 +1,5 @@ /* - * TP-LINK TL-WR841N/ND v9/v11 + * TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 * * Copyright (C) 2014 Matthias Schiffer * Copyright (C) 2016 Cezary Jackiewicz @@ -36,6 +36,20 @@ #define TL_WR841NV9_GPIO_BTN_RESET 12 #define TL_WR841NV9_GPIO_BTN_WIFI 17 +#define TL_WR842NV3_GPIO_LED_SYSTEM 2 +#define TL_WR842NV3_GPIO_LED_WLAN 3 +#define TL_WR842NV3_GPIO_LED_WAN_RED 4 +#define TL_WR842NV3_GPIO_LED_WAN_GREEN 11 +#define TL_WR842NV3_GPIO_LED_LAN1 12 +#define TL_WR842NV3_GPIO_LED_LAN2 13 +#define TL_WR842NV3_GPIO_LED_LAN3 14 +#define TL_WR842NV3_GPIO_LED_LAN4 15 +#define TL_WR842NV3_GPIO_LED_3G 16 +#define TL_WR842NV3_GPIO_LED_WPS 17 + +#define TL_WR842NV3_GPIO_BTN_RESET 1 +#define TL_WR842NV3_GPIO_BTN_WIFI 0 + #define TL_WR841NV11_GPIO_LED_SYSTEM 1 #define TL_WR841NV11_GPIO_LED_QSS 3 #define TL_WR841NV11_GPIO_LED_WAN 4 @@ -111,6 +125,68 @@ static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = { } }; +static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = { + { + .name = "tp-link:green:lan1", + .gpio = TL_WR842NV3_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "tp-link:green:lan2", + .gpio = TL_WR842NV3_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "tp-link:green:lan3", + .gpio = TL_WR842NV3_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "tp-link:green:lan4", + .gpio = TL_WR842NV3_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "tp-link:green:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "tp-link:red:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_RED, + .active_low = 1, + }, { + .name = "tp-link:green:wlan", + .gpio = TL_WR842NV3_GPIO_LED_WLAN, + .active_low = 1, + }, { + .name = "tp-link:green:system", + .gpio = TL_WR842NV3_GPIO_LED_SYSTEM, + .active_low = 1, + }, { + .name = "tp-link:green:3g", + .gpio = TL_WR842NV3_GPIO_LED_3G, + .active_low = 1, + }, { + .name = "tp-link:green:wps", + .gpio = TL_WR842NV3_GPIO_LED_WPS, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_RESET, + .active_low = 1, + }, { + .desc = "WIFI button", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_WIFI, + .active_low = 1, + } +}; + static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = { { .name = "tp-link:green:lan1", @@ -183,6 +259,24 @@ static void __init tl_ap143_setup(void) ath79_register_wmac(ee, tmpmac); } + +static void __init tl_wr842n_v3_setup(void) +{ + tl_ap143_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v3_leds_gpio), + tl_wr842n_v3_leds_gpio); + + ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_wr842n_v3_gpio_keys), + tl_wr842n_v3_gpio_keys); + + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", + tl_wr842n_v3_setup); + static void __init tl_wr841n_v9_setup(void) { tl_ap143_setup(); diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 6cbaf380d9..dbe5981c12 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -590,6 +590,13 @@ define Device/tl-wr842n-v2 TPLINK_HWID := 0x8420002 endef +define Device/tl-wr842n-v3 + $(Device/tplink-16mlzma) + BOARDNAME := TL-WR842N-v3 + DEVICE_PROFILE := TLWR842 + TPLINK_HWID := 0x08420003 +endef + define Device/tl-wr843nd-v1 $(Device/tplink-4mlzma) BOARDNAME := TL-WR841N-v8 @@ -603,7 +610,7 @@ define Device/tl-wr847n-v8 DEVICE_PROFILE := TLWR841 TPLINK_HWID := 0x08470008 endef -TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 +TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr842n-v3 tl-wr843nd-v1 tl-wr847n-v8 define Device/tl-wr941nd-v5 $(Device/tplink-4mlzma) diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index 99e96aaf72..1a378b034d 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1252,7 +1252,7 @@ + select ATH79_DEV_WMAC + +config ATH79_MACH_TL_WR841N_V9 -+ bool "TP-LINK TL-WR841N/ND v9 support" ++ bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support" + select SOC_QCA953X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS And when trying to build the image I got the following error message: echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/metadata.pl kconfig /home/ronaldo/Linux/OpenWrt/src/openwrt/tmp/.packageinfo /home/ronaldo/Linux/OpenWrt/src/openwrt/.config 3.18 > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/kconfig.pl 'm+' '+' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /dev/null /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config mv /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old grep -v INITRAMFS /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config echo 'CONFIG_INITRAMFS_SOURCE=""' >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config rm -rf /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/modules export MAKEFLAGS= ; [ -d /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers ] || make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" INSTALL_HDR_PATH=/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers headers_install . /home/ronaldo/Linux/OpenWrt/src/openwrt/include/shell.sh; grep '=[ym]' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config | LC_ALL=C sort | md5s > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.vermagic touch /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.configured rm -f /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/root-ar71xx/init make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" all modules make[5]: Entering directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' scripts/kconfig/conf --silentoldconfig Kconfig net/sched/Kconfig:43: warning: menuconfig statement without prompt # # configuration written to .config # CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/mips/ath79/mach-tl-wr841n-v9.o In file included from arch/mips/ath79/machtypes.h:15:0, from arch/mips/ath79/mach-tl-wr841n-v9.c:26: arch/mips/ath79/mach-tl-wr841n-v9.c:277:14: error: ''' undeclared here (not in a function) MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", ^ ./arch/mips/include/asm/mips_machine.h:33:15: note: in definition of macro 'MIPS_MACHINE' .mach_type = _type, \ ^ scripts/Makefile.build:257: recipe for target 'arch/mips/ath79/mach-tl-wr841n-v9.o' failed make[7]: *** [arch/mips/ath79/mach-tl-wr841n-v9.o] Error 1 scripts/Makefile.build:402: recipe for target 'arch/mips/ath79' failed make[6]: *** [arch/mips/ath79] Error 2 Makefile:944: recipe for target 'arch/mips' failed make[5]: *** [arch/mips] Error 2 make[5]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' Makefile:24: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image' failed make[4]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image] Error 2 make[4]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux/ar71xx' Makefile:13: recipe for target 'install' failed make[3]: *** [install] Error 2 make[3]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux' target/Makefile:21: recipe for target 'target/linux/install' failed make[2]: *** [target/linux/install] Error 2 make[2]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' target/Makefile:17: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install' failed make[1]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install] Error 2 make[1]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' /home/ronaldo/Linux/OpenWrt/src/openwrt/include/toplevel.mk:181: recipe for target 'world' failed make: *** [world] Error 2 So, it seems that I have to create a patch that incluces 'ATH79_MACH_TL_WR842N_V3' in the file 'arch/mips/ath79/machtypes.h'. Does it make any sense? Am I in the right direction? Can you please help me with that? Thanks ... 2017-11-28 12:38 GMT-02:00 Zoltan HERPAI : On Tue, 28 Nov 2017, Ronaldo Afonso wrote: Hi all, What does it take for a commit to be merged into a stable branch? The thing is ... I really would like to have TL-WR842N Hardware version 3 running on CC. I noticed that this hardware is already working on trunk (master) since last year but not merged into CC yet. How can I help that merge being done? Thanks in advance. You can try to merge this commit [1] into CC, test it out and open a pull-request on github against the chaos_calmer branch - expect some differences that'll need to be worked out manually in image/Makefile. (If you run into problems let me know and will try to help.) Thanks, -w- [1] https://github.com/openwrt/openwrt/commit/d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From tmo26 at gmx.de Tue Nov 28 15:39:32 2017 From: tmo26 at gmx.de (Thomas Endt) Date: Tue, 28 Nov 2017 21:39:32 +0100 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer References: Message-ID: <001601d36888$ffe8bc80$ffba3580$@de> disregard that, I didn?t notice that you already had references that. Von: Thomas Endt [mailto:tmo26 at gmx.de] Gesendet: Dienstag, 28. November 2017 21:35 An: 'Ronaldo Afonso'; 'Zoltan HERPAI' Cc: 'OpenWrt Development List' Betreff: AW: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer This might be of interest: https://git.lede-project.org/?p=source.git;a=commit;h=0b45bec22c59cc6e6b2fa71dc9a88386c5587132 Von: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] Im Auftrag von Ronaldo Afonso Gesendet: Dienstag, 28. November 2017 20:25 An: Zoltan HERPAI Cc: OpenWrt Development List Betreff: Re: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer Hi Zoltan, First of all, thanks for you replay. Following is what I have tried to to: 1) I tried doing a simple "git merge d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2" ... but that resulted in a LOT of errors. 2) So, I decided to look more closely at the commit and manually ported what had being done. Following is the git status and git diff on the CC branch ... ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git status On branch chaos_calmer Your branch is up-to-date with 'origin/chaos_calmer'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: target/linux/ar71xx/base-files/etc/diag.sh modified: target/linux/ar71xx/base-files/etc/uci-defaults/01_leds modified: target/linux/ar71xx/base-files/etc/uci-defaults/02_network modified: target/linux/ar71xx/base-files/lib/ar71xx.sh modified: target/linux/ar71xx/base-files/lib/upgrade/platform.sh modified: target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c modified: target/linux/ar71xx/image/Makefile modified: target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch no changes added to commit (use "git add" and/or "git commit -a") ronaldo at fox:~/Linux/OpenWrt/src/openwrt$ git diff diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 623e2a43b5..85f1e3eab6 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -280,6 +280,7 @@ get_status_led() { tl-wr841n-v11 | \ tl-wa830re-v2 | \ tl-wr842n-v2 | \ + tl-wr841n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5) status_led="tp-link:green:system" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 91f5875c2f..03f01c4050 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -519,6 +519,16 @@ tl-wr842n-v2) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" ;; +tl-wr842n-v3) + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" + ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" + ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" + ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" + ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" + ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" + ;; + tl-wa801nd-v2 | \ tl-wa901nd-v3) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 032c671341..0558c0f33d 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -439,6 +439,7 @@ tl-wr741nd |\ tl-wr741nd-v4 |\ tl-wr841n-v7 |\ tl-wr841n-v9 |\ +tl-wr842n-v3 |\ tl-wr841n-v11 |\ whr-g301n |\ whr-hp-g300n |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 1eb6999908..904ff4b10f 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -821,6 +821,9 @@ ar71xx_board_detect() { *"TL-WR842N/ND v2") name="tl-wr842n-v2" ;; + *"TL-WR842N/ND v3") + name="tl-wr842n-v3" + ;; *TL-WR941ND) name="tl-wr941nd" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index fda7bc417c..bf1e0d295e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -361,6 +361,7 @@ platform_check_image() { tl-wr841n-v9 | \ tl-wr841n-v11 | \ tl-wr842n-v2 | \ + tl-wr842n-v3 | \ tl-wr941nd | \ tl-wr941nd-v5 | \ tl-wr941nd-v6 | \ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c index 004f719613..f33ca2c906 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c @@ -1,5 +1,5 @@ /* - * TP-LINK TL-WR841N/ND v9/v11 + * TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 * * Copyright (C) 2014 Matthias Schiffer * Copyright (C) 2016 Cezary Jackiewicz @@ -36,6 +36,20 @@ #define TL_WR841NV9_GPIO_BTN_RESET 12 #define TL_WR841NV9_GPIO_BTN_WIFI 17 +#define TL_WR842NV3_GPIO_LED_SYSTEM 2 +#define TL_WR842NV3_GPIO_LED_WLAN 3 +#define TL_WR842NV3_GPIO_LED_WAN_RED 4 +#define TL_WR842NV3_GPIO_LED_WAN_GREEN 11 +#define TL_WR842NV3_GPIO_LED_LAN1 12 +#define TL_WR842NV3_GPIO_LED_LAN2 13 +#define TL_WR842NV3_GPIO_LED_LAN3 14 +#define TL_WR842NV3_GPIO_LED_LAN4 15 +#define TL_WR842NV3_GPIO_LED_3G 16 +#define TL_WR842NV3_GPIO_LED_WPS 17 + +#define TL_WR842NV3_GPIO_BTN_RESET 1 +#define TL_WR842NV3_GPIO_BTN_WIFI 0 + #define TL_WR841NV11_GPIO_LED_SYSTEM 1 #define TL_WR841NV11_GPIO_LED_QSS 3 #define TL_WR841NV11_GPIO_LED_WAN 4 @@ -111,6 +125,68 @@ static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = { } }; +static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = { + { + .name = "tp-link:green:lan1", + .gpio = TL_WR842NV3_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "tp-link:green:lan2", + .gpio = TL_WR842NV3_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "tp-link:green:lan3", + .gpio = TL_WR842NV3_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "tp-link:green:lan4", + .gpio = TL_WR842NV3_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "tp-link:green:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "tp-link:red:wan", + .gpio = TL_WR842NV3_GPIO_LED_WAN_RED, + .active_low = 1, + }, { + .name = "tp-link:green:wlan", + .gpio = TL_WR842NV3_GPIO_LED_WLAN, + .active_low = 1, + }, { + .name = "tp-link:green:system", + .gpio = TL_WR842NV3_GPIO_LED_SYSTEM, + .active_low = 1, + }, { + .name = "tp-link:green:3g", + .gpio = TL_WR842NV3_GPIO_LED_3G, + .active_low = 1, + }, { + .name = "tp-link:green:wps", + .gpio = TL_WR842NV3_GPIO_LED_WPS, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_RESET, + .active_low = 1, + }, { + .desc = "WIFI button", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV3_GPIO_BTN_WIFI, + .active_low = 1, + } +}; + static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = { { .name = "tp-link:green:lan1", @@ -183,6 +259,24 @@ static void __init tl_ap143_setup(void) ath79_register_wmac(ee, tmpmac); } + +static void __init tl_wr842n_v3_setup(void) +{ + tl_ap143_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v3_leds_gpio), + tl_wr842n_v3_leds_gpio); + + ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_wr842n_v3_gpio_keys), + tl_wr842n_v3_gpio_keys); + + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", + tl_wr842n_v3_setup); + static void __init tl_wr841n_v9_setup(void) { tl_ap143_setup(); diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 6cbaf380d9..dbe5981c12 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -590,6 +590,13 @@ define Device/tl-wr842n-v2 TPLINK_HWID := 0x8420002 endef +define Device/tl-wr842n-v3 + $(Device/tplink-16mlzma) + BOARDNAME := TL-WR842N-v3 + DEVICE_PROFILE := TLWR842 + TPLINK_HWID := 0x08420003 +endef + define Device/tl-wr843nd-v1 $(Device/tplink-4mlzma) BOARDNAME := TL-WR841N-v8 @@ -603,7 +610,7 @@ define Device/tl-wr847n-v8 DEVICE_PROFILE := TLWR841 TPLINK_HWID := 0x08470008 endef -TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 +TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr842n-v3 tl-wr843nd-v1 tl-wr847n-v8 define Device/tl-wr941nd-v5 $(Device/tplink-4mlzma) diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index 99e96aaf72..1a378b034d 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1252,7 +1252,7 @@ + select ATH79_DEV_WMAC + +config ATH79_MACH_TL_WR841N_V9 -+ bool "TP-LINK TL-WR841N/ND v9 support" ++ bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support" + select SOC_QCA953X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS And when trying to build the image I got the following error message: echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/metadata.pl kconfig /home/ronaldo/Linux/OpenWrt/src/openwrt/tmp/.packageinfo /home/ronaldo/Linux/OpenWrt/src/openwrt/.config 3.18 > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override /home/ronaldo/Linux/OpenWrt/src/openwrt/scripts/kconfig.pl 'm+' '+' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.target /dev/null /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.override > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config mv /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old grep -v INITRAMFS /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config.old > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config echo 'CONFIG_INITRAMFS_SOURCE=""' >> /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config rm -rf /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/modules export MAKEFLAGS= ; [ -d /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers ] || make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" INSTALL_HDR_PATH=/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/user_headers headers_install . /home/ronaldo/Linux/OpenWrt/src/openwrt/include/shell.sh; grep '=[ym]' /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.config | LC_ALL=C sort | md5s > /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.vermagic touch /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.configured rm -f /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/root-ar71xx/init make -C /home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84 HOSTCFLAGS="-O2 -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/include -I/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/host/usr/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-uclibc-" ARCH="mips" KBUILD_HAVE_NLS=no CONFIG_SHELL="bash" V='' CC="mips-openwrt-linux-uclibc-gcc" all modules make[5]: Entering directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' scripts/kconfig/conf --silentoldconfig Kconfig net/sched/Kconfig:43: warning: menuconfig statement without prompt # # configuration written to .config # CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC arch/mips/ath79/mach-tl-wr841n-v9.o In file included from arch/mips/ath79/machtypes.h:15:0, from arch/mips/ath79/mach-tl-wr841n-v9.c:26: arch/mips/ath79/mach-tl-wr841n-v9.c:277:14: error: ''' undeclared here (not in a function) MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", ^ ./arch/mips/include/asm/mips_machine.h:33:15: note: in definition of macro 'MIPS_MACHINE' .mach_type = _type, \ ^ scripts/Makefile.build:257: recipe for target 'arch/mips/ath79/mach-tl-wr841n-v9.o' failed make[7]: *** [arch/mips/ath79/mach-tl-wr841n-v9.o] Error 1 scripts/Makefile.build:402: recipe for target 'arch/mips/ath79' failed make[6]: *** [arch/mips/ath79] Error 2 Makefile:944: recipe for target 'arch/mips' failed make[5]: *** [arch/mips] Error 2 make[5]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84' Makefile:24: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image' failed make[4]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux-ar71xx_generic/linux-3.18.84/.image] Error 2 make[4]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux/ar71xx' Makefile:13: recipe for target 'install' failed make[3]: *** [install] Error 2 make[3]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt/target/linux' target/Makefile:21: recipe for target 'target/linux/install' failed make[2]: *** [target/linux/install] Error 2 make[2]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' target/Makefile:17: recipe for target '/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install' failed make[1]: *** [/home/ronaldo/Linux/OpenWrt/src/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/stamp/.target_install] Error 2 make[1]: Leaving directory '/home/ronaldo/Linux/OpenWrt/src/openwrt' /home/ronaldo/Linux/OpenWrt/src/openwrt/include/toplevel.mk:181: recipe for target 'world' failed make: *** [world] Error 2 So, it seems that I have to create a patch that incluces 'ATH79_MACH_TL_WR842N_V3' in the file 'arch/mips/ath79/machtypes.h'. Does it make any sense? Am I in the right direction? Can you please help me with that? Thanks ... 2017-11-28 12:38 GMT-02:00 Zoltan HERPAI : On Tue, 28 Nov 2017, Ronaldo Afonso wrote: Hi all, What does it take for a commit to be merged into a stable branch? The thing is ... I really would like to have TL-WR842N Hardware version 3 running on CC. I noticed that this hardware is already working on trunk (master) since last year but not merged into CC yet. How can I help that merge being done? Thanks in advance. You can try to merge this commit [1] into CC, test it out and open a pull-request on github against the chaos_calmer branch - expect some differences that'll need to be worked out manually in image/Makefile. (If you run into problems let me know and will try to help.) Thanks, -w- [1] https://github.com/openwrt/openwrt/commit/d42ccc9f28aca96bdd7c83cfac43ae81d24bc5a2 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From aczlan+openwrt at gmail.com Tue Nov 28 18:00:31 2017 From: aczlan+openwrt at gmail.com (Aaron Z) Date: Tue, 28 Nov 2017 18:00:31 -0500 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: On Tue, Nov 28, 2017 at 9:20 AM, Ronaldo Afonso wrote: > Hi all, > What does it take for a commit to be merged into a stable branch? > The thing is ... I really would like to have TL-WR842N Hardware version 3 > running on CC. I noticed that this hardware is already working on trunk > (master) since last year but not merged into CC yet. > How can I help that merge being done? Unless it is a security fix (such as the recent Krack vunerability), updates such as adding a new hardware build are not backported into a stable release. That platform should be there in the next stable release of OpenWrt (presumably the first post-remerge release). It will probbaly not be backported to CC, but it is currently available in LEDE's 17.0.4 stable release (see: https://lede-project.org/toh/hwdata/tp-link/tp-link_tl-wr842n_v3 for links). If you don't know, LEDE is a fork of OpenWrt which is in the process of re-merging with OpenWrt. That is where most of the recent development has happened. Aaron Z A human being should be able to change a diaper, plan an invasion, butcher a hog, conn a ship, design a building, write a sonnet, balance accounts, build a wall, set a bone, comfort the dying, take orders, give orders, cooperate, act alone, solve equations, analyze a new problem, pitch manure, program a computer, cook a tasty meal, fight efficiently, die gallantly. Specialization is for insects. ? Robert Heinlein, Time Enough for Love _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From over3025 at gmail.com Wed Nov 29 06:00:19 2017 From: over3025 at gmail.com (Nam Bong Ha) Date: Wed, 29 Nov 2017 20:00:19 +0900 Subject: [OpenWrt-Devel] Question for configuring OVS on OpenWRT Message-ID: <995C95F1-4A33-474E-AA0E-66CE974245D6@gmail.com> Hi, all I am using an OpenWRT device that is configured to use ovs. I want to communicate between wireless devices and wired devices. Is the following connection possible? ONOS l l l l Device1(lan)---------(lan)OpenWRT-OVS(wireless)-------(wireless)Device2 I tried connecting the controller to OpenWRT (ovs). However, ssh connection was disconnected at the moment of connection. root at Controller$ ssh root@[OpenWRT IP] root at OpenWrt:~# ovs-vsctl show 0ca359f7-74f-420f-b0a5-dfbb6f79 Bridge br-lan Port "eth0.1" Interface "eth0.1" Port br-lan Interface br-lan type: internal root at OpenWrt:~# ovs-vsctl set-controller br-lan tcp:[ONOS IP]:6633 The following is the configuration file for openwrt. /etc/config/wireless config wifi-device 'radio0' option type 'mac80211' option macaddr ':ae:99' list ht_capab 'LDPC' list ht_capab 'SHORT-GI-20' list ht_capab 'SHORT-GI-40' list ht_capab 'TX-STBC' list ht_capab 'RX-STBC1' list ht_capab 'DSSS_CCK-40' option disabled '0' option country 'KR' option hwmode '11ng' option htmode 'HT20' option txpower '11' option channel '1' config wifi-iface option device 'radio0' option mode 'ap' option ssid 'OpenWrt' option encryption 'none' /etc/config/network config interface 'loopback' option ifname 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' config interface 'lan' option type 'bridge' option proto 'static' option netmask '255.255.255.0' option _orig_ifname 'eth0.1 radio0.network1' option _orig_bridge 'true' option ipaddr '192.168.30.1' option ifname 'eth0.1 tap0 wlan0' config interface 'wan' option ifname 'eth0.2' option _orig_ifname 'eth0.2' option _orig_bridge 'false' option proto 'static' option ipaddr '192.168.0.230' option netmask '255.255.254.0' option gateway '192.168.0.1' config switch option name 'switch0' option reset '1' option enable_vlan '1' option enable_learning '0' config switch_vlan option device 'switch0' option vlan '1' option ports '0t 2 3 4 5' option vid '1' config switch_vlan option device 'switch0' option vlan '2' option ports '0t 1' option vid '2' Thank you:) Have a good day :) _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ronaldo at ronaldoafonso.com.br Wed Nov 29 10:07:30 2017 From: ronaldo at ronaldoafonso.com.br (Ronaldo Afonso) Date: Wed, 29 Nov 2017 13:07:30 -0200 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: Ok, Aaron, I'll take a look at the LEDE part of it. I have a "private OpenWrt feed" where I develop some "private OpenWrt application"... If a have to port this feed to the LEDE platform, should I expect a lot of changes? 2017-11-28 21:00 GMT-02:00 Aaron Z : > On Tue, Nov 28, 2017 at 9:20 AM, Ronaldo Afonso > wrote: > > Hi all, > > What does it take for a commit to be merged into a stable branch? > > The thing is ... I really would like to have TL-WR842N Hardware > version 3 > > running on CC. I noticed that this hardware is already working on trunk > > (master) since last year but not merged into CC yet. > > How can I help that merge being done? > Unless it is a security fix (such as the recent Krack vunerability), > updates such as adding a new hardware build are not backported into a > stable release. > That platform should be there in the next stable release of OpenWrt > (presumably the first post-remerge release). > It will probbaly not be backported to CC, but it is currently > available in LEDE's 17.0.4 stable release (see: > https://lede-project.org/toh/hwdata/tp-link/tp-link_tl-wr842n_v3 for > links). > If you don't know, LEDE is a fork of OpenWrt which is in the process > of re-merging with OpenWrt. That is where most of the recent > development has happened. > > Aaron Z > A human being should be able to change a diaper, plan an invasion, > butcher a hog, conn a ship, design a building, write a sonnet, balance > accounts, build a wall, set a bone, comfort the dying, take orders, > give orders, cooperate, act alone, solve equations, analyze a new > problem, pitch manure, program a computer, cook a tasty meal, fight > efficiently, die gallantly. Specialization is for insects. > ? Robert Heinlein, Time Enough for Love > -- Ronaldo Afonso 11 9 5252 0484 www.ronaldoafonso.com.br -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From aczlan+openwrt at gmail.com Wed Nov 29 10:18:21 2017 From: aczlan+openwrt at gmail.com (Aaron Z) Date: Wed, 29 Nov 2017 10:18:21 -0500 Subject: [OpenWrt-Devel] How can I help TL-WR842N Hardware version 3 be merged into Chaos Calmer In-Reply-To: References: Message-ID: On Wed, Nov 29, 2017 at 10:07 AM, Ronaldo Afonso wrote: > Ok, Aaron, > I'll take a look at the LEDE part of it. > I have a "private OpenWrt feed" where I develop some "private OpenWrt > application"... > If a have to port this feed to the LEDE platform, should I expect a lot of > changes? It should be very similar, it was forked from what was then the trunk and that is where continued development has been going on. Aaron Z A human being should be able to change a diaper, plan an invasion, butcher a hog, conn a ship, design a building, write a sonnet, balance accounts, build a wall, set a bone, comfort the dying, take orders, give orders, cooperate, act alone, solve equations, analyze a new problem, pitch manure, program a computer, cook a tasty meal, fight efficiently, die gallantly. Specialization is for insects. ? Robert Heinlein, Time Enough for Love _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From linus.walleij at linaro.org Wed Nov 29 10:30:28 2017 From: linus.walleij at linaro.org (Linus Walleij) Date: Wed, 29 Nov 2017 16:30:28 +0100 Subject: [OpenWrt-Devel] [PATCH] soc: Add SoC driver for Gemini Message-ID: <20171129153028.7313-1-linus.walleij@linaro.org> This adds an SoC driver for the Gemini. Currently there is only one thing not fitting into any other framework, and that is the bus arbitration setting. All Gemini trees seem to be setting this register to exactly the same arbitration so we just add a small code snippet to do this at subsys_init() time before any other drivers kick in. Signed-off-by: Linus Walleij --- drivers/soc/Makefile | 1 + drivers/soc/gemini/Makefile | 2 ++ drivers/soc/gemini/soc-gemini.c | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 drivers/soc/gemini/Makefile create mode 100644 drivers/soc/gemini/soc-gemini.c diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index deecb16e7256..342768df3530 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -9,6 +9,7 @@ obj-y += bcm/ obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ +obj-$(CONFIG_ARCH_GEMINI) += gemini/ obj-$(CONFIG_ARCH_MXC) += imx/ obj-$(CONFIG_SOC_XWAY) += lantiq/ obj-y += mediatek/ diff --git a/drivers/soc/gemini/Makefile b/drivers/soc/gemini/Makefile new file mode 100644 index 000000000000..8cbd1e45db78 --- /dev/null +++ b/drivers/soc/gemini/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += soc-gemini.o diff --git a/drivers/soc/gemini/soc-gemini.c b/drivers/soc/gemini/soc-gemini.c new file mode 100644 index 000000000000..3fac4d1905a8 --- /dev/null +++ b/drivers/soc/gemini/soc-gemini.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 Linaro Ltd. + * + * Author: Linus Walleij + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ +#include +#include +#include +#include +#include + +#define GLOBAL_WORD_ID 0x00 +#define GEMINI_GLOBAL_ARB1_CTRL 0x2c +#define GEMINI_ARB1_BURST_MASK GENMASK(21, 16) +#define GEMINI_ARB1_BURST_SHIFT 16 +/* These all define the priority on the BUS2 backplane */ +#define GEMINI_ARB1_PRIO_MASK GENMASK(9, 0) +#define GEMINI_ARB1_DMAC_HIGH_PRIO BIT(0) +#define GEMINI_ARB1_IDE_HIGH_PRIO BIT(1) +#define GEMINI_ARB1_RAID_HIGH_PRIO BIT(2) +#define GEMINI_ARB1_SECURITY_HIGH_PRIO BIT(3) +#define GEMINI_ARB1_GMAC0_HIGH_PRIO BIT(4) +#define GEMINI_ARB1_GMAC1_HIGH_PRIO BIT(5) +#define GEMINI_ARB1_USB0_HIGH_PRIO BIT(6) +#define GEMINI_ARB1_USB1_HIGH_PRIO BIT(7) +#define GEMINI_ARB1_PCI_HIGH_PRIO BIT(8) +#define GEMINI_ARB1_TVE_HIGH_PRIO BIT(9) + +#define GEMINI_DEFAULT_BURST_SIZE 0x20 +#define GEMINI_DEFAULT_PRIO (GEMINI_ARB1_GMAC0_HIGH_PRIO | \ + GEMINI_ARB1_GMAC1_HIGH_PRIO) + +static int __init gemini_soc_init(void) +{ + struct gemini_arbitration *arb; + struct regmap *map; + u32 rev; + u32 val; + int ret; + + map = syscon_regmap_lookup_by_compatible("cortina,gemini-syscon"); + if (IS_ERR(map)) + return PTR_ERR(map); + ret = regmap_read(map, GLOBAL_WORD_ID, &rev); + if (ret) + return ret; + + val = (GEMINI_DEFAULT_BURST_SIZE << GEMINI_ARB1_BURST_SHIFT) | + GEMINI_DEFAULT_PRIO; + + /* Set up system arbitration */ + regmap_update_bits(map, + GEMINI_GLOBAL_ARB1_CTRL, + GEMINI_ARB1_BURST_MASK | GEMINI_ARB1_PRIO_MASK, + val); + + pr_info("Gemini SoC %04x revision %02x, set arbitration %08x\n", + rev >> 8, rev & 0xff, val); + + return 0; +} +subsys_initcall(gemini_soc_init); -- 2.14.3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From linus.walleij at linaro.org Wed Nov 29 10:44:42 2017 From: linus.walleij at linaro.org (Linus Walleij) Date: Wed, 29 Nov 2017 16:44:42 +0100 Subject: [OpenWrt-Devel] [PATCH] ARM: dts: Add ethernet PHYs to the a bunch of Geminis Message-ID: <20171129154442.16332-1-linus.walleij@linaro.org> These Gemini boards have Ethernet PHY on GPIO bit-banged MDIO, clearly defined in the corresponding OpenWRT ethernet patches since ages. Add them in accordance with the OpenWRT patch so we can use them when we add ethernet support. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-nas4220b.dts | 13 +++++++++++++ arch/arm/boot/dts/gemini-rut1xx.dts | 13 +++++++++++++ arch/arm/boot/dts/gemini-wbd111.dts | 13 +++++++++++++ arch/arm/boot/dts/gemini-wbd222.dts | 18 ++++++++++++++++++ 4 files changed, 57 insertions(+) diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index d6a22e677c7a..51b8353861c3 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -64,6 +64,19 @@ }; }; + mdio0: ethernet-phy { + compatible = "virtual,mdio-gpio"; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy at 0 { + reg = <1>; + device_type = "ethernet-phy"; + }; + }; + soc { flash at 30000000 { status = "okay"; diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts index 500057b6570e..ea0261d9aa97 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -58,6 +58,19 @@ }; }; + mdio0: ethernet-phy { + compatible = "virtual,mdio-gpio"; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy at 0 { + reg = <1>; + device_type = "ethernet-phy"; + }; + }; + soc { flash at 30000000 { status = "okay"; diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts index b413fd12c5ba..3399a9fd292d 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -69,6 +69,19 @@ }; }; + mdio0: ethernet-phy { + compatible = "virtual,mdio-gpio"; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy at 0 { + reg = <1>; + device_type = "ethernet-phy"; + }; + }; + soc { flash at 30000000 { status = "okay"; diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts index 3ba710538662..0be3f57bca80 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -69,6 +69,24 @@ }; }; + mdio0: ethernet-phy { + compatible = "virtual,mdio-gpio"; + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + phy0: ethernet-phy at 0 { + reg = <1>; + device_type = "ethernet-phy"; + }; + + phy1: ethernet-phy at 5 { + reg = <3>; + device_type = "ethernet-phy"; + }; + }; + soc { flash at 30000000 { status = "okay"; -- 2.14.3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From linus.walleij at linaro.org Wed Nov 29 10:47:20 2017 From: linus.walleij at linaro.org (Linus Walleij) Date: Wed, 29 Nov 2017 16:47:20 +0100 Subject: [OpenWrt-Devel] [PATCH] ARM: dts: Add basic devicetree for D-Link DNS-313 Message-ID: <20171129154720.16662-1-linus.walleij@linaro.org> This adds a basic device tree for the D-Link DNS-313 NAS enclosure. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 179 +++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) create mode 100644 arch/arm/boot/dts/gemini-dlink-dns-313.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d0381e9caf21..4388905a4326 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -192,6 +192,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ exynos5800-peach-pi.dtb dtb-$(CONFIG_ARCH_GEMINI) += \ gemini-dlink-dir-685.dtb \ + gemini-dlink-dns-313.dtb \ gemini-nas4220b.dtb \ gemini-rut1xx.dtb \ gemini-sq201.dtb \ diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts new file mode 100644 index 000000000000..aec9343e7e84 --- /dev/null +++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree file for D-Link DNS-313 1-Bay Network Storage Enclosure + */ + +/dts-v1/; + +#include "gemini.dtsi" +#include + +/ { + model = "D-Link DNS-313 1-Bay Network Storage Enclosure"; + compatible = "dlink,dir-313", "cortina,gemini"; + #address-cells = <1>; + #size-cells = <1>; + + memory { + /* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */ + device_type = "memory"; + reg = <0x00000000 0x4000000>; + }; + + aliases { + mdio-gpio0 = &mdio0; + }; + + chosen { + stdout-path = "uart0:19200n8"; + }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + button-esc { + debounce_interval = <50>; + wakeup-source; + linux,code = ; + label = "reset"; + gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + led-power { + label = "dns313:blue:power"; + gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; + default-state = "on"; + linux,default-trigger = "heartbeat"; + }; + led-disk-blue { + label = "dns313:blue:disk"; + gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + led-disk-green { + label = "dns313:green:disk"; + gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; + default-state = "off"; + linux,default-trigger = "ide-disk"; + /* Ideally should activate while reading */ + }; + led-disk-red { + label = "dns313:red:disk"; + gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; + default-state = "off"; + /* Ideally should activate while writing */ + }; + }; + + /* + * This is a ADDA AD0405GB-G73 fan @3000 and 6000 RPM. + */ + gpio-fan { + compatible = "gpio-fan"; + gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>, + <&gpio0 12 GPIO_ACTIVE_HIGH>; + gpio-fan,speed-map = <0 0>, <3000 1>, <6000 2>; + /* If this falls, something is wrong */ + // alarm-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + #cooling-cells = <2>; + }; + + + mdio0: ethernet-phy { + compatible = "virtual,mdio-gpio"; + /* Uses MDC and MDIO */ + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ + #address-cells = <1>; + #size-cells = <0>; + + /* This is a Realtek RTL8211B Gigabit ethernet transceiver */ + phy0: ethernet-phy at 0 { + reg = <1>; + device_type = "ethernet-phy"; + }; + }; + + soc { + flash at 30000000 { + status = "okay"; + /* 512KB of flash */ + reg = <0x30000000 0x00080000>; + + /* + * This "RedBoot" is the Storlink derivative. + */ + partition at 0 { + label = "RedBoot"; + reg = <0x00000000 0x00040000>; + read-only; + }; + partition at 40000 { + label = "MTD1"; + reg = <0x00040000 0x00020000>; + read-only; + }; + partition at 60000 { + label = "MTD2"; + reg = <0x00060000 0x00020000>; + read-only; + }; + }; + + syscon: syscon at 40000000 { + pinctrl { + /* + */ + gpio0_default_pins: pinctrl-gpio0 { + mux { + function = "gpio0"; + groups = + /* Used by LEDs conflicts ICE */ + "gpio0bgrp", + /* Used by ? conflicts ICE */ + "gpio0cgrp", + /* + * Used by fan, conflicts LPC, + * UART modem lines, SSP + */ + "gpio0egrp", + /* Used by MDIO */ + "gpio0igrp"; + }; + }; + gpio1_default_pins: pinctrl-gpio1 { + mux { + function = "gpio1"; + /* Used by "reset" button */ + groups = "gpio1dgrp"; + }; + }; + }; + }; + + sata: sata at 46000000 { + /* The ROM uses this muxmode */ + cortina,gemini-ata-muxmode = <3>; + cortina,gemini-enable-sata-bridge; + status = "okay"; + }; + + gpio0: gpio at 4d000000 { + pinctrl-names = "default"; + pinctrl-0 = <&gpio0_default_pins>; + }; + + gpio1: gpio at 4e000000 { + pinctrl-names = "default"; + pinctrl-0 = <&gpio1_default_pins>; + }; + + ata at 63000000 { + status = "okay"; + }; + }; +}; -- 2.14.3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ardeleanalex at gmail.com Wed Nov 29 15:48:39 2017 From: ardeleanalex at gmail.com (Alexandru Ardelean) Date: Wed, 29 Nov 2017 22:48:39 +0200 Subject: [OpenWrt-Devel] Question for configuring OVS on OpenWRT In-Reply-To: <995C95F1-4A33-474E-AA0E-66CE974245D6@gmail.com> References: <995C95F1-4A33-474E-AA0E-66CE974245D6@gmail.com> Message-ID: On Wed, Nov 29, 2017 at 1:00 PM, Nam Bong Ha wrote: > Hi, all > > I am using an OpenWRT device that is configured to use ovs. > > I want to communicate between wireless devices and wired devices. > Is the following connection possible? > > > ONOS > l > l > l > l > Device1(lan)---------(lan)OpenWRT-OVS(wireless)-------(wireless)Device2 > > > > > I tried connecting the controller to OpenWRT (ovs). > However, ssh connection was disconnected at the moment of connection. > > root at Controller$ ssh root@[OpenWRT IP] > root at OpenWrt:~# ovs-vsctl show > 0ca359f7-74f-420f-b0a5-dfbb6f79 > Bridge br-lan > Port "eth0.1" > Interface "eth0.1" > Port br-lan > Interface br-lan > type: internal I don't know if OVS works with Linux bridges. In the past it didn't ; it was also recommended to disable the Linux bridge kmod. Maybe instead of trying to use br-lan, add all interfaces that are in the br-lan bridge directly to OVS. OVS bridges should work just like Linux bridges. There are some things that are slightly neater with OVS bridges though. > root at OpenWrt:~# ovs-vsctl set-controller br-lan tcp:[ONOS IP]:6633 > > > The following is the configuration file for openwrt. > > /etc/config/wireless > config wifi-device 'radio0' > option type 'mac80211' > option macaddr ':ae:99' > list ht_capab 'LDPC' > list ht_capab 'SHORT-GI-20' > list ht_capab 'SHORT-GI-40' > list ht_capab 'TX-STBC' > list ht_capab 'RX-STBC1' > list ht_capab 'DSSS_CCK-40' > option disabled '0' > option country 'KR' > option hwmode '11ng' > option htmode 'HT20' > option txpower '11' > option channel '1' > > config wifi-iface > option device 'radio0' > option mode 'ap' > option ssid 'OpenWrt' > option encryption 'none' > > > /etc/config/network > config interface 'loopback' > option ifname 'lo' > option proto 'static' > option ipaddr '127.0.0.1' > option netmask '255.0.0.0' > > config interface 'lan' > option type 'bridge' > option proto 'static' > option netmask '255.255.255.0' > option _orig_ifname 'eth0.1 radio0.network1' > option _orig_bridge 'true' > option ipaddr '192.168.30.1' > option ifname 'eth0.1 tap0 wlan0' > > config interface 'wan' > option ifname 'eth0.2' > option _orig_ifname 'eth0.2' > option _orig_bridge 'false' > option proto 'static' > option ipaddr '192.168.0.230' > option netmask '255.255.254.0' > option gateway '192.168.0.1' > > config switch > option name 'switch0' > option reset '1' > option enable_vlan '1' > option enable_learning '0' > > config switch_vlan > option device 'switch0' > option vlan '1' > option ports '0t 2 3 4 5' > option vid '1' > > config switch_vlan > option device 'switch0' > option vlan '2' > option ports '0t 1' > option vid '2' > > Thank you:) > Have a good day :) > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From linus.walleij at linaro.org Wed Nov 29 17:42:59 2017 From: linus.walleij at linaro.org (Linus Walleij) Date: Wed, 29 Nov 2017 23:42:59 +0100 Subject: [OpenWrt-Devel] [PATCH] ARM: dts: Add basic devicetree for D-Link DNS-313 In-Reply-To: <20171129161038.GG24881@lunn.ch> References: <20171129154720.16662-1-linus.walleij@linaro.org> <20171129161038.GG24881@lunn.ch> Message-ID: On Wed, Nov 29, 2017 at 5:10 PM, Andrew Lunn wrote: >> + mdio0: ethernet-phy { >> + compatible = "virtual,mdio-gpio"; >> + /* Uses MDC and MDIO */ >> + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ >> + <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */ >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + /* This is a Realtek RTL8211B Gigabit ethernet transceiver */ >> + phy0: ethernet-phy at 0 { > > Hi Linus > > ethernet-phy at 1 Thanks for pointing out all these. Actually it reflects the most stupid bug I was fighting for several days. After almost giving up I realized reg = <1> for these PHYs, not reg = 0 ... The error was still in the unit name. Fixed this and the other DTS files. Yours, Linus Walleij _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From yszhou4tech at gmail.com Wed Nov 29 21:13:33 2017 From: yszhou4tech at gmail.com (Yousong Zhou) Date: Thu, 30 Nov 2017 10:13:33 +0800 Subject: [OpenWrt-Devel] Question for configuring OVS on OpenWRT In-Reply-To: <995C95F1-4A33-474E-AA0E-66CE974245D6@gmail.com> References: <995C95F1-4A33-474E-AA0E-66CE974245D6@gmail.com> Message-ID: On 29 November 2017 at 19:00, Nam Bong Ha wrote: > Hi, all > > I am using an OpenWRT device that is configured to use ovs. > > I want to communicate between wireless devices and wired devices. > Is the following connection possible? > > > ONOS > l > l > l > l > Device1(lan)---------(lan)OpenWRT-OVS(wireless)-------(wireless)Device2 > > > > > I tried connecting the controller to OpenWRT (ovs). > However, ssh connection was disconnected at the moment of connection. > > root at Controller$ ssh root@[OpenWRT IP] > root at OpenWrt:~# ovs-vsctl show > 0ca359f7-74f-420f-b0a5-dfbb6f79 > Bridge br-lan > Port "eth0.1" > Interface "eth0.1" > Port br-lan > Interface br-lan > type: internal > root at OpenWrt:~# ovs-vsctl set-controller br-lan tcp:[ONOS IP]:6633 You may also need to check the flow rules installed by onos controller. yousong _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zajec5 at gmail.com Thu Nov 30 05:04:53 2017 From: zajec5 at gmail.com (=?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?=) Date: Thu, 30 Nov 2017 11:04:53 +0100 Subject: [OpenWrt-Devel] [PATCH packages] rpcd-mod-lxc: info: return NOT_FOUND if container doesn't exist Message-ID: <20171130100453.1411-1-zajec5@gmail.com> From: Rafa? Mi?ecki It allow distinction between not existing and stopped container. So far querying for not existing container was resulting in: > ubus call lxc info '{ "name": "foo" }' { "name": "foo", "state": "STOPPED", "ips": [ ] } Now it's an error and it matches lxc-info command line: > ubus call lxc info '{ "name": "foo" }' Command failed: Not found > lxc-info --name foo foo doesn't exist Signed-off-by: Rafa? Mi?ecki --- utils/rpcd-mod-lxc/files/lxc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/rpcd-mod-lxc/files/lxc.c b/utils/rpcd-mod-lxc/files/lxc.c index 6db1b311..a98fcfc5 100644 --- a/utils/rpcd-mod-lxc/files/lxc.c +++ b/utils/rpcd-mod-lxc/files/lxc.c @@ -332,6 +332,11 @@ rpc_lxc_info(struct ubus_context *ctx, struct ubus_object *obj, l = rpc_lxc_init(tb); if (!l) return UBUS_STATUS_INVALID_ARGUMENT; + + if (!l->container->is_running(l->container) && + !l->container->is_defined(l->container)) + return UBUS_STATUS_NOT_FOUND; + blob_buf_init(&buf, 0); blobmsg_add_string(&buf, "name", l->container->name); -- 2.11.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel