Re: [LEDE-DEV] openwrt and lede - remerge proposal
Hi, On Mon, 8 May 2017, Daniel Engberg wrote: Trac: Is it really worth keeping trac at all? What value does it add? Just display a page explaining that it's shutdown and forward to OpenWrt? There is a lot of "added value" in the tickets submitted throughout the years, either as comments, notes, fixes or just the issue being raised, so it's a good idea to keep it for archiving purposes. Older devices do die, but every year or so I come across shops selling brand new WRT54G (really), so keeping the knowledge base in an unsorted form (compared to a wiki) to the users can be useful. Whether that's a staticized archive or running the trac engine itself is another question. Other than that, I very much welcome the groundwork for the planned merge - thanks John, Imre and Felix for putting it together. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] openwrt and lede - remerge proposal V2
Hi John, John Crispin wrote: here is a V2 of the remerge proposal, I tried to fold all the comments people made into it, if anything is missing let me know. [snip] Please let us know when you'll start a final vote on this proposal, or if you want to wait a few days if anything bumps in for a V3. I'm OK with this, thanks for putting it together. Thanks, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Hackers] openwrt and lede - remerge proposal V3
Hi, John Crispin wrote: Hi, here is a V3 of the remerge proposal, I tried to fold all the comments people made into it, if anything is missing let me know. Please remeber that post remerge anything can be voted on, so cluttering the proposal with many details will delay the remerge even more. Ideally we manage to vote during this week. [snip] As this seems to have turned into a voting thread as discussed on IRC with John, an ACK from me as well on this v3. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC 00/11] sunxi: upgrade to kernel 4.9 and add A64 support
On Tue, 18 Jul 2017, Hauke Mehrtens wrote: This upgrades the target to kernel 4.9 and also adds support for the Allwinner A64 SoC. This was only tested on the pine64+ and I do not own any older Allwinner SoC. The U-Boot currently depends on dtc and swig being install on the host, I will try to fix this later, but I think we need swig now. Could someone please test this on an older 32 bit Allwinner SoC and report back some results. Ack, will test on the boards I have, these have A10, A13, A20. I wanted to wait with publishing the 4.9 upgrade until the merge, but you beat me to it. ;) Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE call for vote on remerge proposal V3
On 07/10/2017 12:33 PM, Thomas Endt wrote: Transferring the openwrt.org domain to the SPI is seen as a prerequisite before the next steps will be taken by the LEDE developers. @Imre: I assume this needs multiple steps, could you please update us on the status of transferring the openwrt.org domain to the SPI please. Almost two weeks later: What is the status of the domain transfer to the SPI? Is there an estimated timeline available for when the domain transfer will be done and the next steps can start? Please forgive me my impatience, but I'm already thinking of the merge of the two wikis, now that the voting has been done. That's a question I also have now about the status of the transfer. Thanks, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 00/13] sunxi: upgrade to kernel 4.9 and add A64 support
The A8-based devices don't boot (A10/A13), waiting on me to come up with a fix. -w- On Sun, 10 Sep 2017, Lucian CRISTIAN wrote: Is something that blocks these patch sets to go in trunk ? Regards Lucian ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 00/13] sunxi: upgrade to kernel 4.9 and add A64 support
On Sun, 10 Sep 2017, Zoltan HERPAI wrote: The A8-based devices don't boot (A10/A13), waiting on me to come up with a fix. -w- On Sun, 10 Sep 2017, Lucian CRISTIAN wrote: Is something that blocks these patch sets to go in trunk ? It looks like that CONFIG_ARM_LPAE is the culprit for these boards - without it the kernel boots fine on a pcduino-a10, with it it doesn't. It would be a good idea to split the kernel config for A7 and A8 now that they're separated anyways. Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 00/13] sunxi: upgrade to kernel 4.9 and add A64 support
On 09/10/2017 07:10 PM, Zoltan HERPAI wrote: The A8-based devices don't boot (A10/A13), waiting on me to come up with a fix. -w- On Sun, 10 Sep 2017, Lucian CRISTIAN wrote: Is something that blocks these patch sets to go in trunk ? Regards Lucian Hauke, With the splitted configs for the Cortex-A7/A8 devices in your updated staging tree (with LPAE turned off on A8), an A10 booted fine, so: [Tested on Linksprite pcDuino (A10) and BananaPro (A20).] Acked-by: Zoltan HERPAI ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] LEDE call for vote on remerge proposal V3
Hi John, On Tue, 19 Sep 2017, John Crispin wrote: Hi Zoltan, actually its been 29 days since the domain transfer had been completed and ownership has been set properly. i already had a chat with some devs last week about what to do next, people are all very busy with their daytime jobs at the moment and starting on the next step does obviously require some lead time. I was actually hoping to start consolidating the git trees this week but as it turns out i wont have time. hopefully next week will be less busy. Sounds great - I know the feeling unfortunately. Obviously it'd be great if the coordination would be done public to some degree so each of us could pick tasks. Thanks, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] SUNXI: Network problem with kernel 4.9.51
Hi Gerhard, On Sat, 23 Sep 2017, Gerhard Bertelsmann wrote: Hi, I'm trying Lede HEAD with a BananaPI (SUNXI7 A20) and have an issue with the network connection: root@Modellbahn-BPi:/# ping -qc 100 192.168.0.9 PING 192.168.0.9 (192.168.0.9): 56 data bytes [snip] Does anybody have a clue why this happens ? Can you please post a full dmesg. Thanks, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] uboot-sunxi: Backport fix for stale CONFIG_SUNXIG_GMAC references
On Sat, 14 Oct 2017, Florian Fainelli wrote:
This backports the upstream commit fixing stale references to
CONFIG_SUNXI_GMAC which have been later replaced by CONFIG_SUN7I_GMAC.
This fixes the designware MAC pinmuxing on e.g: Lamobo R1.
Signed-off-by: Florian Fainelli
Acked-by: Zoltan HERPAI
---
...02-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch | 93 ++
1 file changed, 93 insertions(+)
create mode 100644
package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch
diff --git
a/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch
b/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch
new file mode 100644
index ..6e8a1ec8509b
--- /dev/null
+++
b/package/boot/uboot-sunxi/patches/302-sunxi-Fix-CONFIG_SUNXI_GMAC-references.patch
@@ -0,0 +1,93 @@
+From 6ff005cf19363382fc867d7876a75fd8a386e894 Mon Sep 17 00:00:00 2001
+From: Dave Prue
+Date: Thu, 31 Aug 2017 19:21:01 +0200
+Subject: [PATCH] sunxi: Fix CONFIG_SUNXI_GMAC references
+
+SUNXI_GMAC was still used to configure the code where as the
+same has been renamed and moved to Kconfig in below commit
+"sunxi: Move SUNXI_GMAC to Kconfig"
+(sha1: 4d43d065db3262f9a9918ba72457bf36dfb8e0bb)
+
+Signed-off-by: Dave Prue
+Reviewed-by: Simon Glass
+Reviewed-by: Jagan Teki
+Reviewed-by: Mark Kettenis
+Tested-by: Mark Kettenis
+[Tweek commit message, config_whitelist.txt, build-whitelist.sh]
+Signed-off-by: Jagan Teki
+---
+ arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +-
+ board/sunxi/Makefile| 2 +-
+ include/configs/sunxi-common.h | 2 +-
+ scripts/build-whitelist.sh | 4 ++--
+ scripts/config_whitelist.txt| 1 -
+ 5 files changed, 5 insertions(+), 6 deletions(-)
+
+Index: u-boot-2017.07/arch/arm/include/asm/arch-sunxi/sys_proto.h
+===
+--- u-boot-2017.07.orig/arch/arm/include/asm/arch-sunxi/sys_proto.h
u-boot-2017.07/arch/arm/include/asm/arch-sunxi/sys_proto.h
+@@ -24,7 +24,7 @@ void sdelay(unsigned long);
+ void return_to_fel(uint32_t lr, uint32_t sp);
+
+ /* Board / SoC level designware gmac init */
+-#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC
++#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUN7I_GMAC
+ void eth_init_board(void);
+ #else
+ static inline void eth_init_board(void) {}
+Index: u-boot-2017.07/board/sunxi/Makefile
+===
+--- u-boot-2017.07.orig/board/sunxi/Makefile
u-boot-2017.07/board/sunxi/Makefile
+@@ -9,7 +9,7 @@
+ # SPDX-License-Identifier:GPL-2.0+
+ #
+ obj-y += board.o
+-obj-$(CONFIG_SUNXI_GMAC) += gmac.o
++obj-$(CONFIG_SUN7I_GMAC) += gmac.o
+ obj-$(CONFIG_SUNXI_AHCI) += ahci.o
+ obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o
+ obj-$(CONFIG_MACH_SUN5I) += dram_sun5i_auto.o
+Index: u-boot-2017.07/include/configs/sunxi-common.h
+===
+--- u-boot-2017.07.orig/include/configs/sunxi-common.h
u-boot-2017.07/include/configs/sunxi-common.h
+@@ -302,7 +302,7 @@ extern int soft_i2c_gpio_scl;
+ #define CONFIG_PHYLIB
+ #endif
+
+-#ifdef CONFIG_SUNXI_GMAC
++#ifdef CONFIG_SUN7I_GMAC
+ #define CONFIG_PHY_GIGE /* GMAC can use gigabit PHY
*/
+ #define CONFIG_PHY_ADDR 1
+ #define CONFIG_MII/* MII PHY management */
+Index: u-boot-2017.07/scripts/build-whitelist.sh
+===
+--- u-boot-2017.07.orig/scripts/build-whitelist.sh
u-boot-2017.07/scripts/build-whitelist.sh
+@@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C
+ # There are two independent greps. The first pulls out the component parts
+ # of CONFIG_SYS_EXTRA_OPTIONS. An example is:
+ #
+-# SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
++# SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
+ #
+ # We want this to produce:
+-# CONFIG_SUNXI_GMAC
++# CONFIG_SUN7I_GMAC
+ # CONFIG_AHCI
+ # CONFIG_SATAPWR
+ #
+Index: u-boot-2017.07/scripts/config_whitelist.txt
+===
+--- u-boot-2017.07.orig/scripts/config_whitelist.txt
u-boot-2017.07/scripts/config_whitelist.txt
+@@ -2371,7 +2371,6 @@ CONFIG_STV0991_HZ_CLOCK
+ CONFIG_ST_SMI
+ CONFIG_SUNXI_AHCI
+ CONFIG_SUNXI_EMAC
+-CONFIG_SUNXI_GMAC
+ CONFIG_SUNXI_GPIO
+ CONFIG_SUNXI_MAX_FB_SIZE
+ CONFIG_SUNXI_USB_PHYS
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] OpenWrt -> LEDE git tree merge
Hi Hauke, On Sun, 22 Oct 2017, Hauke Mehrtens wrote: I am working on merging the missing commits from the OpenWrt git repository into the LEDE repository. Here is a list of all non merge commits from the OpenWrt git repository and their corresponding LEDE commit IDs: https://github.com/hauke/openwrt-lede-merge/blob/master/commits.csv I only looked into the non merge commits and assumed that commits with the same title are the same, if this is wrong please point me to some place where this causes problems. I used this script to generate the csv table: https://github.com/hauke/openwrt-lede-merge/blob/master/openwrt-merge.py The bigger topics I see are: * addition of SoCFPGA target with kernel 4.4 support * Will someone port this to kernel 4.9 or provide me with hardware so I can try to port this and test it? * There are some commits without a Signed-off-by line, I will contact the authors. * The realview target was removed from LEDE, but it got an update to kernel 4.4 in OpenWrt, how do we want to handle this? Does anyone need the realview target? As discussed earlier, I've prepared manually a list of commits that are missing from LEDE. I was about to send: - a set of patches that probably don't need any discussion and can be merged right away, - a set of patches that are RFC, and should be discussed. Let me know if that should still happen. Thanks, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/9] hwmon-coretemp: add thermal monitor for Core/Core2/Atom
From: Philip Prindeville Signed-off-by: Philip Prindeville --- package/kernel/linux/modules/hwmon.mk | 15 +++ 1 file changed, 15 insertions(+) diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index ed05cae..ae1a004 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -108,6 +108,21 @@ endef $(eval $(call KernelPackage,hwmon-nct6775)) +define KernelPackage/hwmon-coretemp + TITLE:=Intel Core/Core2/Atom thermal monitoring support + KCONFIG:=CONFIG_SENSORS_CORETEMP + FILES:=$(LINUX_DIR)/drivers/hwmon/coretemp.ko + AUTOLOAD:=$(call AutoProbe,coretemp) + $(call AddDepends/hwmon,@TARGET_x86) +endef + +define KernelPackage/hwmon-coretemp/description + Kernel module for Intel Core/Core2/Atom thermal monitor chip +endef + +$(eval $(call KernelPackage,hwmon-coretemp)) + + define KernelPackage/hwmon-ina2xx TITLE:=INA2XX monitoring support KCONFIG:=CONFIG_SENSORS_INA2XX -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/9] package: kernel: dtc: Add device tree compiler package
From: Marek Vasut Add package with the DT compiler v1.4.1 . Signed-off-by: Marek Vasut --- package/kernel/dtc/Makefile | 36 1 file changed, 36 insertions(+) create mode 100644 package/kernel/dtc/Makefile diff --git a/package/kernel/dtc/Makefile b/package/kernel/dtc/Makefile new file mode 100644 index 000..5155323 --- /dev/null +++ b/package/kernel/dtc/Makefile @@ -0,0 +1,36 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dtc +PKG_VERSION:=1.4.1 +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/utils/dtc/dtc.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=302fca9f4c283e1994cf0a5a9ce1cf43ca15e6d2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_MAINTAINER:=Marek Vasut +PKG_LICENSE:=GPL-2.0+ + +include $(INCLUDE_DIR)/package.mk + +define Package/dtc + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Device Tree Compiler +endef + +define Package/dtc/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dtc $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,dtc)) -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 7/9] sunxi: Added profile for HAOYU Electronics Marsboard A10
From: Kayo Phoenix The MarsBoard was a short-lived credit-card sized, extendable board with an Allwinner A10 SoC. http://linux-sunxi.org/MarsBoard_A10 Signed-off-by: Kayo Phoenix [Forward-ported to new target layout:] Signed-off-by: Zoltan HERPAI --- package/boot/uboot-sunxi/Makefile | 6 ++ target/linux/sunxi/image/cortex-a8.mk | 10 ++ 2 files changed, 16 insertions(+) diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 50c6b06..d986f62 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -96,6 +96,12 @@ define U-Boot/Hummingbird_A31 NAME:=Hummingbird A31 board endef +define U-Boot/Marsboard + BUILD_SUBTARGET:=cortexa8 + NAME:=Marsboard + BUILD_DEVICES:=sun4i-a10-marsboard +endef + define U-Boot/Mele_M9 BUILD_SUBTARGET:=cortexa7 NAME:=Mele M9 (A31) diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index 97e033d..564a66f 100644 --- a/target/linux/sunxi/image/cortex-a8.mk +++ b/target/linux/sunxi/image/cortex-a8.mk @@ -56,4 +56,14 @@ endef TARGET_DEVICES += sun4i-a10-pcduino + +define Device/sun4i-a10-marsboard + DEVICE_TITLE:=HAOYU Electronics Marsboard A10 + DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi sound-soc-sunxi + SUPPORTED_DEVICES:=marsboard,a10-marsboard + SUNXI_DTS:=sun4i-a10-marsboard +endef + +TARGET_DEVICES += sun4i-a10-marsboard + endif -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 4/9] openssl: fix cryptodev config dependency
From: Ralph Sennhauser Signed-off-by: Ralph Sennhauser --- package/libs/openssl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in index dbcd11a..b949d3b 100644 --- a/package/libs/openssl/Config.in +++ b/package/libs/openssl/Config.in @@ -59,4 +59,5 @@ endif config OPENSSL_ENGINE_CRYPTO bool + select OPENSSL_HARDWARE_SUPPORT prompt "Crypto acceleration support" if PACKAGE_libopenssl -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 0/9] merge: add missing devices / commits into LEDE
This series contains a bunch of commits that have been added into OpenWrt but not into LEDE since May/2016. Some of these required small changes to work properly - i.e. changing them to a new build layout. Signed-off-by: Zoltan HERPAI August Germar (1): ar71xx: add support for Anonabox Pro Denis Osvald (1): netfilter,iptables: add optional CHECKSUM module Kayo Phoenix (1): sunxi: Added profile for HAOYU Electronics Marsboard A10 Marek Vasut (2): package: kernel: dtc: Add device tree compiler package package: kernel: dtc: Add DTO support Philip Prindeville (1): hwmon-coretemp: add thermal monitor for Core/Core2/Atom Ralph Sennhauser (1): openssl: fix cryptodev config dependency Zoltan HERPAI (2): ar71xx: add support for Comfast E214N V2 Outdoor CPE ramips: add Devolo WiFi Repeater (mt2681) include/netfilter.mk | 4 + package/boot/uboot-sunxi/Makefile | 6 + package/kernel/dtc/Makefile| 36 ++ ...ripts-dtc-Update-to-version-with-overlays.patch | 642 + package/kernel/linux/modules/hwmon.mk | 15 + package/kernel/linux/modules/netfilter.mk | 17 + package/libs/openssl/Config.in | 1 + package/network/utils/iptables/Makefile| 10 + target/linux/ar71xx/base-files/etc/board.d/01_leds | 10 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 6 + .../ar71xx/base-files/lib/upgrade/platform.sh | 2 + target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/config-4.9 | 2 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 19 + target/linux/ar71xx/files/arch/mips/ath79/Makefile | 2 + .../files/arch/mips/ath79/mach-anonabox-pro.c | 110 .../files/arch/mips/ath79/mach-cf-e214n-v2.c | 124 .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 2 + target/linux/ar71xx/image/generic.mk | 8 + target/linux/ar71xx/image/legacy-devices.mk| 6 + target/linux/ar71xx/image/legacy.mk| 2 + target/linux/ramips/base-files/etc/board.d/01_leds | 7 + .../linux/ramips/base-files/etc/board.d/02_network | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 + .../ramips/base-files/lib/upgrade/platform.sh | 1 + target/linux/ramips/dts/MT2681.dts | 106 target/linux/ramips/image/rt305x.mk| 7 + target/linux/sunxi/image/cortex-a8.mk | 10 + 28 files changed, 1160 insertions(+) create mode 100644 package/kernel/dtc/Makefile create mode 100644 package/kernel/dtc/patches/0001-scripts-dtc-Update-to-version-with-overlays.patch create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-anonabox-pro.c create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e214n-v2.c create mode 100644 target/linux/ramips/dts/MT2681.dts -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 8/9] ramips: add Devolo WiFi Repeater (mt2681)
This is pretty much the same as the ALL0256N-8M but with different LED settings.
Based on Matt Jenkins' patch, with additional reworks.
https://github.com/openwrt/openwrt/pull/491
Signed-off-by: Zoltan HERPAI
---
target/linux/ramips/base-files/etc/board.d/01_leds | 7 ++
.../linux/ramips/base-files/etc/board.d/02_network | 1 +
target/linux/ramips/base-files/lib/ramips.sh | 3 +
.../ramips/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ramips/dts/MT2681.dts | 106 +
target/linux/ramips/image/rt305x.mk| 7 ++
6 files changed, 125 insertions(+)
create mode 100644 target/linux/ramips/dts/MT2681.dts
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds
b/target/linux/ramips/base-files/etc/board.d/01_leds
index 75ab0da..525c32b 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -55,6 +55,13 @@ air3gii)
set_wifi_led "$board:green:wlan"
set_usb_led "$board:green:mobile"
;;
+mt2681)
+ ucidef_set_rssimon "wlan0" "4" "1"
+ ucidef_set_led_rssi "rssilow" "RSSILOW" "$board:green:rssilow" "wlan0"
"1" "40" "0" "6"
+ ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$board:green:rssimed"
"wlan0" "30" "80" "-29" "5"
+ ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$board:green:rssihigh"
"wlan0" "70" "100" "-69" "8"
+ set_wifi_led "rt2800pci-phy0::radio"
+ ;;
all0256n-4M|\
all0256n-8M)
ucidef_set_rssimon "wlan0" "20" "1"
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network
b/target/linux/ramips/base-files/etc/board.d/02_network
index 1c8505e..101c97e 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -53,6 +53,7 @@ ramips_setup_interfaces()
m2m|\
microwrt|\
mpr-a2|\
+ mt2681|\
ncs601w|\
omega2 | \
omega2p | \
diff --git a/target/linux/ramips/base-files/lib/ramips.sh
b/target/linux/ramips/base-files/lib/ramips.sh
index 07e776c..e451b0e 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -331,6 +331,9 @@ ramips_board_detect() {
*"MR200")
name="mr200"
;;
+ *"MT2681")
+ name="mt2681"
+ ;;
*"MT7620a + MT7530 evaluation"*)
name="mt7620a_mt7530"
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 99ebe35..5430be7 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -98,6 +98,7 @@ platform_check_image() {
mpr-a1|\
mpr-a2|\
mr-102n|\
+ mt2681|\
mt7628|\
mzk-750dhp|\
mzk-dp150n|\
diff --git a/target/linux/ramips/dts/MT2681.dts
b/target/linux/ramips/dts/MT2681.dts
new file mode 100644
index 000..634e8c8
--- /dev/null
+++ b/target/linux/ramips/dts/MT2681.dts
@@ -0,0 +1,106 @@
+/dts-v1/;
+
+#include "rt3050.dtsi"
+
+/ {
+ compatible = "ralink,rt3050-soc";
+ model = "Devolo WiFi Extender MT2681";
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ rssilow {
+ label = "mt2681:green:rssilow";
+ gpios = <&gpio0 7 1>;
+ };
+
+ rssimed {
+ label = "mt2681:green:rssimed";
+ gpios = <&gpio0 11 1>;
+ };
+
+ rssihigh {
+ label = "mt2681:green:rssihigh";
+ gpios = <&gpio0 12 1>;
+ };
+
+ wifi {
+ label = "mt2681:red:wifi";
+ gpios = <&gpio0 9 1>;
+ };
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <20>;
+
+ reset {
+ label = "reset";
+ gpios = <&gpio0 10 1>;
+ linux,code = <0x198>;
+ };
+ };
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&
[LEDE-DEV] [PATCH 9/9] ar71xx: add support for Comfast E214N V2 Outdoor CPE
Based on Robert Budde's patch, with additional reworks.
https://github.com/openwrt/openwrt/pull/390
Signed-off-by: Zoltan HERPAI
---
target/linux/ar71xx/base-files/etc/board.d/01_leds | 10 ++
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ar71xx/config-4.4 | 1 +
target/linux/ar71xx/config-4.9 | 1 +
.../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 8 ++
target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 +
.../files/arch/mips/ath79/mach-cf-e214n-v2.c | 124 +
.../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 +
target/linux/ar71xx/image/generic.mk | 8 ++
10 files changed, 158 insertions(+)
create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e214n-v2.c
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index 27e6c8a..5707624 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -182,6 +182,16 @@ carambola2)
ucidef_set_led_netdev "wan" "WAN" "$board:orange:eth1" "eth1"
ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
;;
+cf-e214n-v2)
+ ucidef_set_led_netdev "lan" "LAN" "$board:lan" "eth0"
+ ucidef_set_led_netdev "wan" "WAN" "$board:wan" "eth1"
+ ucidef_set_led_wlan "wlan" "WLAN" "$board:wlan" "phy0tpt"
+ ucidef_set_rssimon "wlan" "20" "1"
+ ucidef_set_led_rssi "rssilow" "RSSILOW" "$board:link1" "wlan" "1" "100"
"0" "13"
+ ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$board:link2"
"wlan" "26" "100" "-25" "13"
+ ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$board:link3"
"wlan" "51" "100" "-50" "13"
+ ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$board:link4" "wlan" "76"
"100" "-75" "13"
+ ;;
cf-e316n-v2)
ucidef_set_led_netdev "lan" "LAN" "$board:blue:lan" "eth0"
ucidef_set_led_netdev "wan" "WAN" "$board:blue:wan" "eth1"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index bdba81b..1c1317d 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -504,6 +504,9 @@ ar71xx_board_detect() {
*"Carambola2"*)
name="carambola2"
;;
+ *"CF-E214N v2")
+ name="cf-e214n-v2"
+ ;;
*"CF-E316N v2")
name="cf-e316n-v2"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index a60e44c..e768386 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -215,6 +215,7 @@ platform_check_image() {
bullet-m|\
c-55|\
carambola2|\
+ cf-e214n-v2|\
cf-e316n-v2|\
cf-e320n-v2|\
cf-e355ac|\
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index 4793bf4..d8f94e3 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -67,6 +67,7 @@ CONFIG_ATH79_MACH_C55=y
CONFIG_ATH79_MACH_CAP324=y
CONFIG_ATH79_MACH_CAP4200AG=y
CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E214N_V2=y
CONFIG_ATH79_MACH_CF_E316N_V2=y
CONFIG_ATH79_MACH_CF_E320N_V2=y
CONFIG_ATH79_MACH_CF_E355AC=y
diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9
index 285c638..df90b20 100644
--- a/target/linux/ar71xx/config-4.9
+++ b/target/linux/ar71xx/config-4.9
@@ -66,6 +66,7 @@ CONFIG_ATH79_MACH_C55=y
CONFIG_ATH79_MACH_CAP324=y
CONFIG_ATH79_MACH_CAP4200AG=y
CONFIG_ATH79_MACH_CARAMBOLA2=y
+CONFIG_ATH79_MACH_CF_E214N_V2=y
CONFIG_ATH79_MACH_CF_E316N_V2=y
CONFIG_ATH79_MACH_CF_E320N_V2=y
CONFIG_ATH79_MACH_CF_E355AC=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index ac77aed..a382f90 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -2032,6 +2
[LEDE-DEV] [PATCH 5/9] netfilter, iptables: add optional CHECKSUM module
From: Denis Osvald Signed-off-by: Denis Osvald --- include/netfilter.mk | 4 package/kernel/linux/modules/netfilter.mk | 17 + package/network/utils/iptables/Makefile | 10 ++ 3 files changed, 31 insertions(+) diff --git a/include/netfilter.mk b/include/netfilter.mk index 2d53758..3d735a8 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -262,6 +262,10 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_i $(eval $(call nf_add,IPT_U32,CONFIG_NETFILTER_XT_MATCH_U32, $(P_XT)xt_u32)) +# checksum + +$(eval $(call nf_add,IPT_CHECKSUM,CONFIG_NETFILTER_XT_TARGET_CHECKSUM, $(P_XT)xt_CHECKSUM)) + # netlink diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 0ad6987..0d817ed 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -529,6 +529,23 @@ endef $(eval $(call KernelPackage,ipt-u32)) +define KernelPackage/ipt-checksum + TITLE:=CHECKSUM support + KCONFIG:= \ + CONFIG_NETFILTER_XT_TARGET_CHECKSUM + FILES:= \ + $(LINUX_DIR)/net/netfilter/xt_CHECKSUM.ko \ + $(foreach mod,$(IPT_CHECKSUM-m),$(LINUX_DIR)/net/$(mod).ko) + AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CHECKSUM-m))) + $(call AddDepends/ipt) +endef + +define KernelPackage/ipt-checksum/description + Kernel modules for CHECKSUM fillin target +endef + +$(eval $(call KernelPackage,ipt-checksum)) + define KernelPackage/ipt-iprange TITLE:=Module for matching ip ranges diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 89f4354..817f094 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -381,6 +381,15 @@ U32 iptables extensions. endef +define Package/iptables-mod-checksum +$(call Package/iptables/Module, +kmod-ipt-checksum) + TITLE:=IP CHECKSUM target extension +endef + +define Package/iptables-mod-checksum/description +iptables extension for the CHECKSUM calculation target +endef + define Package/ip6tables $(call Package/iptables/Default) DEPENDS:=@IPV6 +kmod-ip6tables +iptables @@ -585,6 +594,7 @@ $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m))) $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m))) $(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m))) $(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m))) +$(eval $(call BuildPlugin,iptables-mod-checksum,$(IPT_CHECKSUM-m))) $(eval $(call BuildPackage,ip6tables)) $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m))) $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m))) -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 3/9] package: kernel: dtc: Add DTO support
From: Marek Vasut
Add patch with the DT overlay support into the DTC package.
Signed-off-by: Marek Vasut
---
...ripts-dtc-Update-to-version-with-overlays.patch | 642 +
1 file changed, 642 insertions(+)
create mode 100644
package/kernel/dtc/patches/0001-scripts-dtc-Update-to-version-with-overlays.patch
diff --git
a/package/kernel/dtc/patches/0001-scripts-dtc-Update-to-version-with-overlays.patch
b/package/kernel/dtc/patches/0001-scripts-dtc-Update-to-version-with-overlays.patch
new file mode 100644
index 000..605d303
--- /dev/null
+++
b/package/kernel/dtc/patches/0001-scripts-dtc-Update-to-version-with-overlays.patch
@@ -0,0 +1,642 @@
+From 5f84cb93eef9f8a8ff7f49d593893f252744d0fe Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou
+Date: Wed, 26 Aug 2015 18:28:08 +0300
+Subject: [PATCH] scripts/dtc: Update to version with overlays
+
+Update to mainline dtc with overlay support
+
+Signed-off-by: Pantelis Antoniou
+---
+ checks.c | 20 +-
+ dtc-lexer.l | 5 ++
+ dtc-parser.y | 54 ++--
+ dtc.c| 83 ++--
+ dtc.h| 13 +++-
+ livetree.c | 202 +++
+ treesource.c | 3 +
+ util.c | 2 +-
+ 8 files changed, 367 insertions(+), 15 deletions(-)
+
+diff --git a/checks.c b/checks.c
+index 3bf0fa4..af25c2b 100644
+--- a/checks.c
b/checks.c
+@@ -465,8 +465,12 @@ static void fixup_phandle_references(struct check *c,
struct node *dt,
+
+ refnode = get_node_by_ref(dt, m->ref);
+ if (! refnode) {
+- FAIL(c, "Reference to non-existent node or label
\"%s\"\n",
+- m->ref);
++ if (!source_is_plugin)
++ FAIL(c, "Reference to non-existent node or "
++ "label \"%s\"\n", m->ref);
++ else /* mark the entry as unresolved */
++ *((cell_t *)(prop->val.val + m->offset)) =
++ cpu_to_fdt32(0x);
+ continue;
+ }
+
+@@ -559,7 +563,7 @@ static void check_reg_format(struct check *c, struct node
*dt,
+ size_cells = node_size_cells(node->parent);
+ entrylen = (addr_cells + size_cells) * sizeof(cell_t);
+
+- if ((prop->val.len % entrylen) != 0)
++ if (!entrylen || (prop->val.len % entrylen) != 0)
+ FAIL(c, "\"reg\" property in %s has invalid length (%d bytes) "
+"(#address-cells == %d, #size-cells == %d)",
+node->fullpath, prop->val.len, addr_cells, size_cells);
+@@ -651,6 +655,15 @@ static void
check_obsolete_chosen_interrupt_controller(struct check *c,
+ }
+ TREE_WARNING(obsolete_chosen_interrupt_controller, NULL);
+
++static void check_deprecated_plugin_syntax(struct check *c,
++ struct node *dt)
++{
++ if (deprecated_plugin_syntax_warning)
++ FAIL(c, "Use '/dts-v1/ /plugin/'; syntax. /dts-v1/; /plugin/; "
++ "is going to be removed in next versions");
++}
++TREE_WARNING(deprecated_plugin_syntax, NULL);
++
+ static struct check *check_table[] = {
+ &duplicate_node_names, &duplicate_property_names,
+ &node_name_chars, &node_name_format, &property_name_chars,
+@@ -668,6 +681,7 @@ static struct check *check_table[] = {
+
+ &avoid_default_addr_size,
+ &obsolete_chosen_interrupt_controller,
++ &deprecated_plugin_syntax,
+
+ &always_fail,
+ };
+diff --git a/dtc-lexer.l b/dtc-lexer.l
+index 0ee1caf..dd44ba2 100644
+--- a/dtc-lexer.l
b/dtc-lexer.l
+@@ -113,6 +113,11 @@ static void lexical_error(const char *fmt, ...);
+ return DT_V1;
+ }
+
++<*>"/plugin/" {
++ DPRINT("Keyword: /plugin/\n");
++ return DT_PLUGIN;
++ }
++
+ <*>"/memreserve/" {
+ DPRINT("Keyword: /memreserve/\n");
+ BEGIN_DEFAULT();
+diff --git a/dtc-parser.y b/dtc-parser.y
+index ea57e0a..7d9652d 100644
+--- a/dtc-parser.y
b/dtc-parser.y
+@@ -19,6 +19,7 @@
+ */
+ %{
+ #include
++#include
+
+ #include "dtc.h"
+ #include "srcpos.h"
+@@ -52,9 +53,11 @@ extern bool treesource_error;
+ struct node *nodelist;
+ struct reserve_info *re;
+ uint64_t integer;
++ bool is_plugin;
+ }
+
+ %token DT_V1
++%token DT_PLUGIN
+ %token DT_MEMRESERVE
+ %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR
+ %token DT_BITS
+@@ -71,6 +74,7 @@ extern bool treesource_error;
+
+ %type propdata
+ %type propdataprefix
++%type plugindecl
+ %type memreserve
+ %type memreserves
+ %type arrayprefix
+@@ -101,10 +105,39 @@ extern bool treesource_error;
+ %%
+
+ sourcefile:
+-DT_V1 ';' memreserves devicetree
++ basesource
++| pluginsource
++
[LEDE-DEV] [PATCH 6/9] ar71xx: add support for Anonabox Pro
From: August Germar
Chipset is a 650mhz Atheros with 128mb ram.
Variation of QCA9531 SoC with two Ethernet ports
and a 802.11n 2.4 GHz radio.
Signed-off-by: August Germar
[with review by Daniel Engberg]
Reviewed-by: Zoltan HERPAI
---
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ar71xx/config-4.9 | 1 +
.../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 11 +++
target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 +
.../files/arch/mips/ath79/mach-anonabox-pro.c | 110 +
.../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 +
target/linux/ar71xx/image/legacy-devices.mk| 6 ++
target/linux/ar71xx/image/legacy.mk| 2 +
9 files changed, 136 insertions(+)
create mode 100644
target/linux/ar71xx/files/arch/mips/ath79/mach-anonabox-pro.c
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index f89c009..bdba81b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -687,6 +687,9 @@ ar71xx_board_detect() {
*"HiWiFi HC6361")
name="hiwifi-hc6361"
;;
+ *"ANONABOX_PRO")
+ name="anonabox-pro"
+ ;;
*"Hornet-UB")
local size="$(mtd_get_part_size 'firmware')"
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 3d6d9ed..a60e44c 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -310,6 +310,7 @@ platform_check_image() {
;;
alfa-ap96|\
alfa-nx|\
+ anonabox-pro|\
ap121-mini|\
ap121|\
ap135-020|\
diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9
index 84b2a0b..285c638 100644
--- a/target/linux/ar71xx/config-4.9
+++ b/target/linux/ar71xx/config-4.9
@@ -36,6 +36,7 @@ CONFIG_ATH79_MACH_ALFA_AP96=y
CONFIG_ATH79_MACH_ALFA_NX=y
CONFIG_ATH79_MACH_ALL0258N=y
CONFIG_ATH79_MACH_ALL0315N=y
+CONFIG_ATH79_MACH_ANONABOX_PRO=y
CONFIG_ATH79_MACH_ANTMINER_S1=y
CONFIG_ATH79_MACH_ANTMINER_S3=y
CONFIG_ATH79_MACH_ANTROUTER_R1=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 5cb4f7e..ac77aed 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -124,6 +124,17 @@ config ATH79_MACH_ALL0315N
select ATH79_DEV_LEDS_GPIO
select ATH79_DEV_M25P80
+config ATH79_MACH_ANONABOX_PRO
+ bool "Anonabox Pro board"
+ select SOC_QCA953X
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_SPI
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+ select ATH79_DEV_ETH
+ select ATH79_DEV_M25P80
+
config ATH79_MACH_ANTMINER_S1
bool "Bitmain Antminer S1 support"
select SOC_AR933X
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 7d12282..e6f0cae 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_ATH79_MACH_ALFA_AP96)+=
mach-alfa-ap96.o
obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o
obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o
obj-$(CONFIG_ATH79_MACH_ALL0315N) += mach-all0315n.o
+obj-$(CONFIG_ATH79_MACH_ANONABOX_PRO) += mach-anonabox-pro.o
obj-$(CONFIG_ATH79_MACH_ANTMINER_S1) += mach-antminer-s1.o
obj-$(CONFIG_ATH79_MACH_ANTMINER_S3) += mach-antminer-s3.o
obj-$(CONFIG_ATH79_MACH_ANTROUTER_R1) += mach-antrouter-r1.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-anonabox-pro.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-anonabox-pro.c
new file mode 100644
index 000..3fc4c39
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-anonabox-pro.c
@@ -0,0 +1,110 @@
+/*
+ * AnonaBox QCA9531 board support
+ *
+ * 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.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRA
Re: [LEDE-DEV] [OpenWrt-Devel] OpenWrt -> LEDE git tree merge
Hi, Zoltan HERPAI wrote: Hi Hauke, On Sun, 22 Oct 2017, Hauke Mehrtens wrote: I am working on merging the missing commits from the OpenWrt git repository into the LEDE repository. Here is a list of all non merge commits from the OpenWrt git repository and their corresponding LEDE commit IDs: https://github.com/hauke/openwrt-lede-merge/blob/master/commits.csv I only looked into the non merge commits and assumed that commits with the same title are the same, if this is wrong please point me to some place where this causes problems. I used this script to generate the csv table: https://github.com/hauke/openwrt-lede-merge/blob/master/openwrt-merge.py The bigger topics I see are: * addition of SoCFPGA target with kernel 4.4 support * Will someone port this to kernel 4.9 or provide me with hardware so I can try to port this and test it? * There are some commits without a Signed-off-by line, I will contact the authors. * The realview target was removed from LEDE, but it got an update to kernel 4.4 in OpenWrt, how do we want to handle this? Does anyone need the realview target? As discussed earlier, I've prepared manually a list of commits that are missing from LEDE. I was about to send: - a set of patches that probably don't need any discussion and can be merged right away, - a set of patches that are RFC, and should be discussed. Let me know if that should still happen. The series has been sent as discussed on irc. I don't recall any more required - also based on checking the CSV, thanks for prepping that. The RFC patches/PRs are: - https://github.com/openwrt/openwrt/pull/433 I'd like to add genimage support to OpenWrt. With this package one can create arbitrary image either for internal flash or SD/USB storage devices. As this package is basically applicable to any target should I enable it in tools/Makefile tools-y target? - https://github.com/openwrt/openwrt/pull/409 Add nconfig toplevel target to utilize ncurses ui configuration utility as found on kernel's buildsystem. - https://github.com/openwrt/openwrt/pull/533 tools: add package autoconf-archive - https://github.com/openwrt/openwrt/pull/464 Add full control of network configuration to a user script #464 - https://github.com/openwrt/openwrt/pull/312 ar71xx: add support for Zsun WiFi SD Card Reader - https://github.com/openwrt/openwrt/commit/4f997727aef0603f02e9320ba787ea1b894747c0 lantiq: td-w8980: fix failsafe mode via ethernet. - https://github.com/openwrt/openwrt/commit/9fb1348a0aa8954535ec5a2c088037af0d7b9297 packages: lzo: Update LZO Makefile to repair dead Main URL - https://github.com/openwrt/openwrt/pull/539 Add TL-WA901v5 support - #1-4 would require discussion if they're needed at all, they look as "nice to have". - #5 needs some work as it has some dirty hacks. This can be taken care on the summit's second day - I recall someone going there has a ZSun reader - #6 - I haven't seen traces of this in LEDE, but I leave it to the lantiq experts to opinion on - #7 was due to an outage if I recall correctly, again, it's optional - #8 - needs some further changes around creating the -factory image Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] OpenWrt -> LEDE git tree merge
Hi Mathias, On Mon, 23 Oct 2017, Mathias Kresin wrote: 22.10.2017 22:56, Hauke Mehrtens: On 10/22/2017 10:28 PM, Zoltan HERPAI wrote: Hi, - https://github.com/openwrt/openwrt/pull/312 ar71xx: add support for Zsun WiFi SD Card Reader This is missing a Singed-of-by line A few days ago a similar PR was created (and unfortunately already closed): https://github.com/lede-project/source/pull/1422. The OpenWrt PR has a lot of issues, like enabling unencrypted wireless for the whole target. "- #5 needs some work as it has some dirty hacks. This can be taken care on the summit's second day - I recall someone going there has a ZSun reader" So, fully agree, I could have written s/some work/full rework/. If n0p doesn't come back with the fixes by the summit, we could take care of adding the support there, with the actual hardware to test. -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 8/9] ramips: add Devolo WiFi Repeater (mt2681)
Hi Mathias, On Mon, 23 Oct 2017, Mathias Kresin wrote: 22.10.2017 22:21, Zoltan HERPAI: This is pretty much the same as the ALL0256N-8M but with different LED settings. Based on Matt Jenkins' patch, with additional reworks. https://github.com/openwrt/openwrt/pull/491 Signed-off-by: Zoltan HERPAI Hey Zoltan, I'm not sure how proceed with the patch. It has bunch of issues and if someone else would send this patch I wouldn't merge it as it is. Some of the issues are: - missing hardware description in the commit message - missing initial install instructions in the commit message - bad board naming (the name looks like a mediatek reference board) - wrong use of wifi led - outdated syntax in the dts Since you most likely do not have this board, I'm not sure if it does make any sense to do the full review => request changes cycle. Any suggestions how to proceed with this one? Correct, I don't have the hardware, and the HW descriptions I've found on google are misleading. I'm leaning more towards dropping this, and if someone wants support for it, he/she can prep the patch correctly. -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 6/9] ar71xx: add support for Anonabox Pro
L. D. Pinney wrote: Why does this patch use "legacy" ? On Monday, October 23, 2017, 4:23:20 AM GMT+8, Zoltan HERPAI wrote: Because this seemed to build, and without access to the actual hardware, I had to rely on the PR sent. Happy to see that August is also on the thread now. :) Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] sunxi: add Orange Pi 2 support
- H3 @ 1.3 GHz - 1GiB DDR3 - 10/100Mbps Ethernet - Realtek RTL8189ETV wifi - 4 USB 2.0 Difference to the "Orange Pi Plus" is the lack of Gbit ethernet and lack of onboard flash. Signed-off-by: Zoltan HERPAI --- package/boot/uboot-sunxi/Makefile | 7 +++ target/linux/sunxi/image/cortex-a7.mk | 9 + 2 files changed, 16 insertions(+) diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 50c6b06..b0737b7 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -144,6 +144,12 @@ define U-Boot/orangepi_plus BUILD_DEVICES:=sun8i-h3-orangepi-plus endef +define U-Boot/orangepi_2 + BUILD_SUBTARGET:=cortexa7 + NAME:=Orange Pi 2 (H3) + BUILD_DEVICES:=sun8i-h3-orangepi-2 +endef + define U-Boot/pangolin BUILD_SUBTARGET:=cortexa7 NAME:=Theobroma A31-yQ7 devboard @@ -179,6 +185,7 @@ UBOOT_TARGETS := \ nanopi_neo \ orangepi_r1 \ orangepi_plus \ + orangepi_2 \ pangolin \ pine64_plus diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index d0b7aa0..d219a1d 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -136,6 +136,15 @@ endef TARGET_DEVICES += sun8i-h3-orangepi-plus +define Device/sun8i-h3-orangepi-2 + DEVICE_TITLE:=Xunlong Orange Pi 2 + DEVICE_PACKAGES:=kmod-rtc-sunxi + SUPPORTED_DEVICES:=xunlong,orangepi-2 + SUNXI_DTS:=sun8i-h3-orangepi-2 +endef + +TARGET_DEVICES += sun8i-h3-orangepi-2 + define Device/sun7i-a20-pcduino3 DEVICE_TITLE:=LinkSprite pcDuino3 -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 9/9] ar71xx: add support for Comfast E214N V2 Outdoor CPE
Hi, Piotr Dymacz wrote: Hello Zoltan, On 22.10.2017 22:21, Zoltan HERPAI wrote: Based on Robert Budde's patch, with additional reworks. https://github.com/openwrt/openwrt/pull/390 Signed-off-by: Zoltan HERPAI --- [snip] We have some COMFAST devices already supported under ar71xx target in LEDE and as they are very similar, support for all of them (IIRC) is kept in single mach file [1]. This limits code duplication, e.g. for their external watchdog, network initialization, etc. Also, after a brief review, I found some issues here: - LED names don't follow general naming convention (color is missing) - support for reset button is missing - COMFAST keeps ART copy in last 64 KB mtd partition, thus we have a "art-backup" partition defined [2], not "nvram" as in the patch Personally, I would prefer to include support for this model in the same way as we did for rest from this vendor. How would you like to proceed with this one then? For the record, we've started to work on this offline with Bill and Piotr to add support into the common mach file. Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] merge: add OpenWrt branding
Given that we've decided to sail under the same flag for the benefit of the whole community, and acknowledge the achievements of the LEDE project, let's start the final steps of the merge. The git and other sources are untouched until the infra merge. Signed-off-by: Zoltan HERPAI Signed-off-by: Imre Kaloz diff --git a/Config.in b/Config.in index ddbc4e2..d30c048 100644 --- a/Config.in +++ b/Config.in @@ -4,7 +4,7 @@ # See /LICENSE for more information. # -mainmenu "LEDE Configuration" +mainmenu "OpenWrt Configuration" config MODULES option modules diff --git a/Makefile b/Makefile index 09db75c..0a1f96a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ empty:= space:= $(empty) $(empty) -$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces)) +$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces)) world: diff --git a/README b/README index 405c18b..864ea2f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is the buildsystem for the LEDE Linux distribution. +This is the buildsystem for the OpenWrt Linux distribution. Please use "make menuconfig" to choose your preferred configuration for the toolchain and firmware. @@ -23,7 +23,7 @@ the lack of case sensitiveness in the file system. Sunshine! - Your LEDE Community - http://www.lede-project.org + Your OpenWrt Community + http://www.openwrt.org diff --git a/include/image-commands.mk b/include/image-commands.mk index aaece70..3507578 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -7,7 +7,7 @@ define Build/uImage mkimage -A $(LINUX_KARCH) \ -O linux -T kernel \ -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new + -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new mv $@.new $@ endef @@ -60,7 +60,7 @@ endef define Build/netgear-dni $(STAGING_DIR_HOST)/bin/mkdniimg \ - -B $(NETGEAR_BOARD_ID) -v LEDE.$(REVISION) \ + -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ -r "$(1)" \ -i $@ -o $@.new @@ -83,7 +83,7 @@ define Build/append-uImage-fakeroot-hdr rm -f $@.fakeroot $(STAGING_DIR_HOST)/bin/mkimage \ -A $(LINUX_KARCH) -O linux -T filesystem -C none \ - -n '$(call toupper,$(LINUX_KARCH)) LEDE fakeroot' \ + -n '$(call toupper,$(LINUX_KARCH)) OpenWrt fakeroot' \ -s \ $@.fakeroot cat $@.fakeroot >> $@ diff --git a/include/image.mk b/include/image.mk index 3f5b454..eccf943 100644 --- a/include/image.mk +++ b/include/image.mk @@ -136,7 +136,7 @@ endef define Image/BuildKernel/MkuImage mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \ - -n '$(call toupper,$(ARCH)) LEDE Linux-$(LINUX_VERSION)' -d $(4) $(5) + -n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5) endef define Image/BuildKernel/MkFIT diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 7d96921..0fab326 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -18,7 +18,7 @@ $(eval $(call TestHostCommand,working-make, \ $(MAKE) -v | grep -E 'Make (3\.8[1-9]|3\.9[0-9]|[4-9]\.)')) $(eval $(call TestHostCommand,case-sensitive-fs, \ - LEDE can only be built on a case-sensitive filesystem, \ + OpenWrt can only be built on a case-sensitive filesystem, \ rm -f $(TMP_DIR)/test.*; touch $(TMP_DIR)/test.fs; \ test ! -f $(TMP_DIR)/test.FS)) diff --git a/include/version.mk b/include/version.mk index 1a0d3c9..4a8ac0b 100644 --- a/include/version.mk +++ b/include/version.mk @@ -40,23 +40,23 @@ VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) -VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),LEDE) +VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) VERSION_DIST_SANITIZED:=$(call sanitize,$(VERSION_DIST)) VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION
Re: [LEDE-DEV] merge: add OpenWrt branding
Hi Hannu, On Tue, 24 Oct 2017, Hannu Nyman wrote: Zoltan HERPAI kirjoitti 24.10.2017 klo 14:46: Given that we've decided to sail under the same flag for the benefit of the whole community, and acknowledge the achievements of the LEDE project, let's start the final steps of the merge. The git and other sources are untouched until the infra merge. ... @@ -1,10 +1,13 @@ - \ DE\ /%N (%V, %C) + DESIGNATED DRIVER (%C, %R) Please do not re-introduce hard-coded version branding into various files. All version info was centralised to include/version.mk by this commit: https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68 and further refined with https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68 Yep, this was pointed out by Jo as well, will change it. Ps. And are the drinks really back on the menu? I think at least a vote was about to happen on this topic for the next release :) -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] merge: add OpenWrt branding
Hi Jo,
On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
Hi,
comments inline.
Signed-off-by: Imre Kaloz
Given the fact that we explicitely wanted to avoid @openwrt.org mails
and that this was one of the discussion points leading to the split I
find it delicate to seal the merging commit with exactly such a S-o-b.
Combined with ...
$ git log --author "Imre Kaloz " --format=%cD -1
Tue, 18 Oct 2016 11:42:06 +0200
... this looks to me like nothing was learned from past experiences and
that all that matters here is having the own name attached to the work
being done.
LEDE does have patches in the tree s-o-b-ed and accepted like this dated
January '17. (f24ffb901e0408917748773b883841eca52eea05)
"*) email accounts
- currently there are around ~20 active openwrt.org mail accounts (the 3 owrt
devs would like to keep theirs active)
- turn all the webmaster@, hostmaster@, ... accounts into aliases that anyone
with voting rights can be subscribed to
- ask those people that are no longer active to voluntarily give up their
accounts
- mail addresses may under no conditions be used for any personal business,
consultancy, applying for jobs, ... purposes
- any mail sent from an openwrt.org account needs to adhere the trademark policy and
should only be used for FOSS purposes"
In my view, this is FOSS purpose rather than anything else.
Anyhow, on to the code.
diff --git a/Config.in b/Config.in
index ddbc4e2..d30c048 100644
--- a/Config.in
+++ b/Config.in
[...]
VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if
$(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
+VERSION_REPO:=$(if
$(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots)
We need to setup the server first or delegate downloads.openwrt.org to
downloads.lede-project.org or add a rewrite rule to redirect
http://downloads.openwrt.org/snapshots/(.*) to
http://downloads.lede-project.org/snapshots/$1 for now.
Agreed, there are dependencies on the infrastructure side for this to be
merged - or I'm OK to back it out until it's done. Having said that, this
is easier to crack compared to the $LEDE_GIT source entries in the
packages.
VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
-VERSION_BUG_URL:=$(if
$(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
+VERSION_BUG_URL:=$(if
$(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
Likewise.
Likewise.
VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
-VERSION_SUPPORT_URL:=$(if
$(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
+VERSION_SUPPORT_URL:=$(if
$(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)
Undecided.
TBD.
VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
[...]
diff --git a/package/base-files/files/etc/banner
b/package/base-files/files/etc/banner
index 4ec646a..af51b5a 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,10 +1,13 @@
- _
-//\ ____ ___ ___
- / LE/ \| | | __| \| __|
- /DE /\ | |__| _|| |) | _|
- // LE \ ||___|___/|___| lede-project.org
- \\ DE /
- \LE \/ ---
- \ DE\ /%N (%V, %C)
-\\/---
-
+ ___ __
+ | |.-.-.-.| | | |..| |_
+ | - || _ | -__| || | | || _|| _|
+ |___|| __|_|__|__||||__| ||
+ |__| W I R E L E S S F R E E D O M
+ -
+ DESIGNATED DRIVER (%C, %R)
Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
r3560-79f57e422d) are more useful under the new version scheme than "%C,
%R" (r3560-79f57e422d, r3560-79f57e422d)
Let's stash the "DESIGNATED DRIVER" until others reply. VERSION_NUMBER
is currently SNAPSHOT - we should let others decide the cocktail part
of it. :)
+ -
+ * 2 oz. Orange Juice Combine all juices in a
+ * 2 oz. Pineapple Juice tall glass filled with
+ * 2 oz. Grapefruit Juice ice, stir well.
+ * 2 oz. Cranberry Juice
+ -
diff --git a/package/base-files/files/etc/init.d/system
b/package/base-files/files/etc/init.d/system
index 8c5f677..54c0e3e 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -7,7 +7,7 @@ USE_PROCD=1
validate_system_section()
{
uci_validate_section system system "${1}" \
- 'hostname:string:lede' \
+ 'hostname:string:openwrt' \
Whi
Re: [LEDE-DEV] [OpenWrt-Devel] merge: add OpenWrt branding
Hi Hauke, On Tue, 24 Oct 2017, Hauke Mehrtens wrote: On 10/24/2017 09:47 PM, Hans Dedecker wrote: On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin wrote: 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI : Signed-off-by: Imre Kaloz Given the fact that we explicitely wanted to avoid @openwrt.org mails and that this was one of the discussion points leading to the split I find it delicate to seal the merging commit with exactly such a S-o-b. Combined with ... $ git log --author "Imre Kaloz " --format=%cD -1 Tue, 18 Oct 2016 11:42:06 +0200 ... this looks to me like nothing was learned from past experiences and that all that matters here is having the own name attached to the work being done. LEDE does have patches in the tree s-o-b-ed and accepted like this dated January '17. (f24ffb901e0408917748773b883841eca52eea05) "*) email accounts - currently there are around ~20 active openwrt.org mail accounts (the 3 owrt devs would like to keep theirs active) - turn all the webmaster@, hostmaster@, ... accounts into aliases that anyone with voting rights can be subscribed to - ask those people that are no longer active to voluntarily give up their accounts - mail addresses may under no conditions be used for any personal business, consultancy, applying for jobs, ... purposes - any mail sent from an openwrt.org account needs to adhere the trademark policy and should only be used for FOSS purposes" In my view, this is FOSS purpose rather than anything else. Can't we just find some kind of gentleman/ladies agreement to not use the mail addresses in public? I mean, I never got why these three people insists on using their mail addresses for anything other than receiving mail/as a forwarder. As soon as someone starts to use a @openwrt.org mail address, basically all other are forced to do so as well. Otherwise the way it comes across is N @openwrt.org core devs + X people committing as well. Which I'm quite sure is what nobody wants to see. my two cents Mathias I agree with Mathias can't we find a better consensus on the usage of the openwrt mail address ? Now it looks like 3 people officially represent the project next to the other developers; this will only cause friction in the future. Hans I agree with Mathias and Hans, I also do not like this and this looks like some are more equal than others to outsiders. I have no problem when the mails are getting forward to the old user of the address, so that people who send a mail to some @openwrt.org address still reach the correct person, this can also stay activate forever when someone wants to maintain the service. The @openwrt.org addresses should not be used in communication, especially when it is related to OpenWrt, this includes S-o-b lines, copyright lines and outgoing communication. Getting a consensus is one thing, arguing against what was voted on is another. I don't think that anyone wants to misrepresent the project or cause friction of any kind - such behaviour would be beyond professionalism, and these things were discussed in detail in the remerge proposals -, especially when the Reboot has achieved a lot of things, and we should look into the future. Having said all that, currently I can only create a v2 of this patch with the fixes asked/proposed. Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Given that we've decided to sail under the same flag for the benefit of the whole community, and acknowledge the achievements of the LEDE project, let's start the final steps of the merge. The git and other sources are untouched until the infra merge. v2: - dismiss bugtracker and forum change - update uhttpd cert gen - update banner - update busybox NSLOOKUP patch Signed-off-by: Zoltan HERPAI Signed-off-by: Imre Kaloz --- Config.in | 2 +- Makefile | 2 +- README | 6 +++--- include/image-commands.mk | 6 +++--- include/image.mk | 2 +- include/prereq-build.mk| 2 +- include/version.mk | 8 package/base-files/Makefile| 2 +- package/base-files/files/bin/config_generate | 10 +- package/base-files/files/etc/banner| 23 -- package/base-files/files/etc/init.d/system | 2 +- .../files/lib/preinit/10_indicate_preinit | 2 +- package/base-files/image-config.in | 10 +- package/boot/uboot-layerscape-armv8_32b/Makefile | 2 +- .../kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 2 +- package/kernel/mac80211/files/lib/wifi/mac80211.sh | 2 +- package/network/services/hostapd/files/hostapd.sh | 4 ++-- package/network/services/lldpd/files/lldpd.config | 2 +- package/network/services/lldpd/files/lldpd.init| 2 +- .../network/services/samba36/files/samba.config| 4 ++-- package/network/services/samba36/files/samba.init | 6 +++--- .../network/services/uhttpd/files/uhttpd.config| 2 +- package/network/services/uhttpd/files/uhttpd.init | 2 +- package/network/utils/iproute2/Makefile| 2 +- package/utils/busybox/Config-defaults.in | 4 ++-- package/utils/busybox/config/networking/Config.in | 12 +-- .../busybox/patches/230-add_nslookup_lede.patch| 16 +++ package/utils/ct-bugcheck/src/bugcheck.sh | 4 ++-- scripts/brcmImage.pl | 2 +- scripts/checkpatch.pl | 2 +- scripts/config/mconf.c | 2 +- scripts/qemustart | 12 +-- target/imagebuilder/Config.in | 2 +- target/imagebuilder/files/repositories.conf| 2 +- target/linux/apm821xx/image/Makefile | 2 +- target/linux/ar71xx/image/generic.mk | 4 ++-- target/linux/ar71xx/image/legacy.mk| 4 ++-- target/linux/ar71xx/image/tp-link.mk | 2 +- target/linux/armvirt/README| 16 +++ target/linux/brcm63xx/image/bcm63xx.mk | 6 +++--- target/linux/lantiq/image/Makefile | 2 +- target/linux/mcs814x/image/Makefile| 2 +- target/linux/mvebu/image/cfbase-boot.script| 4 ++-- target/linux/mvebu/image/cfpro-boot.script | 4 ++-- .../linux/omap24xx/base-files/etc/config/wireless | 2 +- target/linux/uml/README| 5 +++-- target/linux/x86/image/grub-iso.cfg| 2 +- target/linux/x86/image/grub.cfg| 4 ++-- target/sdk/Config.in | 4 ++-- target/sdk/files/README.SDK| 4 ++-- target/toolchain/Config.in | 6 +++--- target/toolchain/files/README.TOOLCHAIN| 2 +- toolchain/gcc/common.mk| 4 ++-- 53 files changed, 124 insertions(+), 120 deletions(-) diff --git a/Config.in b/Config.in index ddbc4e2..d30c048 100644 --- a/Config.in +++ b/Config.in @@ -4,7 +4,7 @@ # See /LICENSE for more information. # -mainmenu "LEDE Configuration" +mainmenu "OpenWrt Configuration" config MODULES option modules diff --git a/Makefile b/Makefile index 09db75c..0a1f96a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export TOPDIR LC_ALL LANG TZ empty:= space:= $(empty) $(empty) -$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE directory must not include any spaces)) +$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces)) world: diff --git a/README b/README index 405c18b..864ea2f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is the buildsystem for the LEDE Linux distribution. +This is the buildsystem for the OpenWrt Linux distribution. Please use "make menuconfig" to choose your preferred configuration for the toolchain and firmware. @@ -23,7 +23,7 @@ the lack of case sensitiveness in the file system. Sunshine! - Your LEDE Community - http://w
Re: [LEDE-DEV] [PATCH v2] merge: add OpenWrt branding
Hi Hauke, Hauke Mehrtens wrote: On 10/26/2017 09:05 PM, Dave Taht wrote: Hannu Nyman writes: Zoltan HERPAI kirjoitti 26.10.2017 klo 18:41: + - + * 2 oz. Orange Juice Combine all juices in a + * 2 oz. Pineapple Juice tall glass filled with + * 2 oz. Grapefruit Juice ice, stir well. + * 2 oz. Cranberry Juice + - Still promoting the drink recipe although the voting is clearly going against release names and also all given feedback about drinks has been negative? I incidentally have always liked the in-your-face anti-establishment flair of using codenames based on alcoholic beverages. The drink meme beats the hell out of corporate blandness with selecting codenames out of a marketing jar - "Project Olympus!", and is easier to remember than 17.X.Y. "Blurry fish butt" I think was (until recently) a codename for the linux kernel. and I've joked elsewhere that I'd like a codename named "green goddess". https://www.allbud.com/marijuana-strains/sativa-dominant-hybrid/green-goddess Please get rid of it. It makes the whole thing looks adolescent. And replace it with what? (where was the voting?) The vote happened here: http://lists.infradead.org/pipermail/lede-adm/2017-October/000636.html I am also for removing this, without the code names it does not makes any sense. This banner is the first thing companies change to add they own brand. If you want to annoy them, use this license in some important part: ;-) WTFPL (Do What the Fuck You Want To Public License) Fine, then please advise where else this needs to be removed from, before I send the v3. $ grep RELEASE include/version.mk RELEASE:=Reboot VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) For the sake of full transparency, Imre and me was not part of the vote, as that was sent to lede-adm, without including openwrt-hackers or openwrt-devel. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v3] merge: add OpenWrt branding
Given that we've decided to sail under the same flag for the benefit of the whole community, and acknowledge the achievements of the LEDE project, let's start the final steps of the merge. The git and other sources are untouched until the infra merge. v2: - dismiss bugtracker and forum change - update uhttpd cert gen - update banner - update busybox NSLOOKUP patch 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 10
[LEDE-DEV] [PATCH v4 7/8] merge: uhttpd: update cert generation to match system defaults
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
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v4 6/8] merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch
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 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v4 5/8] merge: packages: update branding in core packages
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.@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_keepalive1
# Basic auth realm, defaults to local hostname
-# option realmLede
+# option realmOpenWrt
# 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/b
[LEDE-DEV] [PATCH v4 8/8] merge: etc: update remaining files
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 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v4 1/8] merge: base: update base-files and basic config
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.@system[0]
add system system
- set system.@system[-1].hostname='LEDE'
+ set system.@system[-1].hostname='OpenWrt'
set system.@system[-1].timezone='UTC'
set system.@system[-1].ttylogin='0'
set system.@system[-1].log_size='64'
@@ -233,10 +233,10 @@ generate_static_system() {
set system.ntp='timeserver'
set system.ntp.enabled='1'
set system.ntp.enable_server='0'
- add_list system.ntp.server='0.lede.pool.ntp.org'
- add_list system.ntp.server='1.lede.pool.ntp.org'
- add_list system.ntp.server='2.lede.pool.ntp.org'
- add_list system.ntp.server='3.lede.pool.ntp.org'
+ add_list system.ntp.server='0.openwrt.pool.ntp.org'
+ add_list system.ntp.server='1.openwrt.pool.ntp.org'
+ add_list system.ntp.server='2.openwrt.pool.ntp.org'
+ add_list system.ntp.server='3.openwrt.pool.ntp.org'
EOF
if json_is_a system object; then
diff --git a/package/base-files/files/etc/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_indica
[LEDE-DEV] [PATCH v4 4/8] merge: ssid: update default ssid
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
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v4 3/8] merge: targets: update image generation and targets
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 => 0xbfc0, 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 \\ +
[LEDE-DEV] [PATCH v4 0/8] merge: add OpenWrt branding
Given that we've decided to sail under the same flag for the benefit of the whole community, and acknowledge the achievements of the LEDE project, let's start the final steps of the merge. The git and other sources are untouched until the infra merge. v2: - dismiss bugtracker and forum change - update uhttpd cert gen - update banner - update busybox NSLOOKUP patch 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 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v4 2/8] merge: release/banner: drop release name and update banner
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 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v4 0/8] merge: add OpenWrt branding
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 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v4 0/8] merge: add OpenWrt branding
Zoltan HERPAI wrote: 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 Ping Felix/Hauke. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ramips: add support for Asus RT-N11P / RT-N12+ / RT-N12E b1
This is a variant of the MT7620N-based Asus routers.
Specifications:
- MT7620N (580 MHz)
- 32 MB RAM
- 8 MB Flash
- 5x 10/100Mbps Ethernet (built-in switch)
- 2.4 GHz WLAN
- 2x external, non-detachable antennas
- UART (J2) header on PCB (115200 8n1)
Flash instructions:
1. Configure PC with static IP 192.168.1.75
2. Connect PC with one of LAN ports, press the reset button, power up
the router and keep button pressed for around 6-7 seconds. All 4 LEDs will
start to blink, which is when the router will accept firmware files via TFTP.
No known limitations on firmware filenames, just send it with a TFTP client
to 192.168.1.1 .
3. Router will download file from server, write it to flash and reboot.
Signed-off-by: Zoltan HERPAI
---
target/linux/ramips/base-files/etc/board.d/01_leds | 6 +
.../linux/ramips/base-files/etc/board.d/02_network | 1 +
target/linux/ramips/base-files/lib/ramips.sh | 3 +
.../ramips/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ramips/dts/RT-N12-PLUS.dts| 121 +
target/linux/ramips/image/mt7620.mk| 7 ++
6 files changed, 139 insertions(+)
create mode 100644 target/linux/ramips/dts/RT-N12-PLUS.dts
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds
b/target/linux/ramips/base-files/etc/board.d/01_leds
index 74e405e..0c97dc9 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -340,6 +340,12 @@ rt-ac51u)
set_wifi_led "$board:blue:wifi"
set_usb_led "$board:blue:usb" "1-1"
;;
+rt-n12p)
+ ucidef_set_led_default "power" "power" "$board:green:power" "1"
+ ucidef_set_led_netdev "lan" "lan" "$board:green:lan" eth0.1
+ ucidef_set_led_netdev "wan" "wan" "$board:green:wan" eth0.2
+ set_wifi_led "$board:green:air"
+ ;;
rt-n14u)
ucidef_set_led_default "power" "power" "$board:blue:power" "1"
ucidef_set_led_netdev "lan" "lan" "$board:blue:lan" eth0.1
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network
b/target/linux/ramips/base-files/etc/board.d/02_network
index 6ad64e6..db797c6 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -100,6 +100,7 @@ ramips_setup_interfaces()
psg1208|\
psg1218a|\
r6220|\
+ rt-n12p)
sap-g3200u3|\
sk-wb8|\
u7621-06-256M-16M|\
diff --git a/target/linux/ramips/base-files/lib/ramips.sh
b/target/linux/ramips/base-files/lib/ramips.sh
index 76ca3d1..bf19a4c 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -460,6 +460,9 @@ ramips_board_detect() {
*"RT-N10+")
name="rt-n10-plus"
;;
+ *"RT-N12+")
+ name="rt-n12p"
+ ;;
*"RT-N13U")
name="rt-n13u"
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 0d5b6bb..3181da2 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -130,6 +130,7 @@ platform_check_image() {
rt-ac51u|\
rt-g32-b1|\
rt-n10-plus|\
+ rt-n12p|\
rt-n13u|\
rt-n14u|\
rt-n15|\
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts
b/target/linux/ramips/dts/RT-N12-PLUS.dts
new file mode 100644
index 000..746fd98
--- /dev/null
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -0,0 +1,121 @@
+/dts-v1/;
+
+#include "mt7620n.dtsi"
+
+#include
+#include
+
+/ {
+ compatible = "asus,rt-n12p", "ralink,mt7620n-soc";
+ model = "Asus RT-N12+";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ wan {
+ label = "rt-n12p:green:wan";
+ gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+ };
+
+ lan {
+ label = "rt-n12p:green:lan";
+ gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+ };
+
+ power {
+ label = "rt-n12p:green:power";
+ gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+ };
+
+ air {
+ label = "rt-n12p:green:air";
+ gpios = <&
[LEDE-DEV] [PATCH v2] ramips: add support for Asus RT-N11P / RT-N12+ / RT-N12E b1
This is a variant of the MT7620N-based Asus routers.
Specifications:
- MT7620N (580 MHz)
- 32 MB RAM
- 8 MB Flash
- 5x 10/100Mbps Ethernet (built-in switch)
- 2.4 GHz WLAN
- 2x external, non-detachable antennas
- UART (J2) header on PCB (115200 8n1)
Flash instructions:
1. Configure PC with static IP 192.168.1.75
2. Connect PC with one of LAN ports, press the reset button, power up
the router and keep button pressed for around 6-7 seconds. All 4 LEDs will
start to blink, which is when the router will accept firmware files via TFTP.
No known limitations on firmware filenames, just send it with a TFTP client
to 192.168.1.1.
3. Router will download file from server, write it to flash and reboot.
Changes in v2:
- update LED config for LAN/WAN
- disable USB
- drop incorrectly added mt76 from DEVICE_PACKAGES
(wlan is supported by rt2x00)
Signed-off-by: Zoltan HERPAI
---
target/linux/ramips/base-files/etc/board.d/01_leds | 6 ++
.../linux/ramips/base-files/etc/board.d/02_network | 1 +
target/linux/ramips/base-files/lib/ramips.sh | 3 +
.../ramips/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ramips/dts/RT-N12-PLUS.dts| 117 +
target/linux/ramips/image/mt7620.mk| 6 ++
6 files changed, 134 insertions(+)
create mode 100644 target/linux/ramips/dts/RT-N12-PLUS.dts
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds
b/target/linux/ramips/base-files/etc/board.d/01_leds
index 74e405e..0c97dc9 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -340,6 +340,12 @@ rt-ac51u)
set_wifi_led "$board:blue:wifi"
set_usb_led "$board:blue:usb" "1-1"
;;
+rt-n12p)
+ ucidef_set_led_default "power" "power" "$board:green:power" "1"
+ ucidef_set_led_netdev "lan" "lan" "$board:green:lan" eth0.1
+ ucidef_set_led_netdev "wan" "wan" "$board:green:wan" eth0.2
+ set_wifi_led "$board:green:air"
+ ;;
rt-n14u)
ucidef_set_led_default "power" "power" "$board:blue:power" "1"
ucidef_set_led_netdev "lan" "lan" "$board:blue:lan" eth0.1
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network
b/target/linux/ramips/base-files/etc/board.d/02_network
index 6ad64e6..db797c6 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -100,6 +100,7 @@ ramips_setup_interfaces()
psg1208|\
psg1218a|\
r6220|\
+ rt-n12p)
sap-g3200u3|\
sk-wb8|\
u7621-06-256M-16M|\
diff --git a/target/linux/ramips/base-files/lib/ramips.sh
b/target/linux/ramips/base-files/lib/ramips.sh
index 76ca3d1..bf19a4c 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -460,6 +460,9 @@ ramips_board_detect() {
*"RT-N10+")
name="rt-n10-plus"
;;
+ *"RT-N12+")
+ name="rt-n12p"
+ ;;
*"RT-N13U")
name="rt-n13u"
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 0d5b6bb..3181da2 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -130,6 +130,7 @@ platform_check_image() {
rt-ac51u|\
rt-g32-b1|\
rt-n10-plus|\
+ rt-n12p|\
rt-n13u|\
rt-n14u|\
rt-n15|\
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts
b/target/linux/ramips/dts/RT-N12-PLUS.dts
new file mode 100644
index 000..f3e0284
--- /dev/null
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -0,0 +1,117 @@
+/dts-v1/;
+
+#include "mt7620n.dtsi"
+
+#include
+#include
+
+/ {
+ compatible = "asus,rt-n12p", "ralink,mt7620n-soc";
+ model = "Asus RT-N12+";
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ wan {
+ label = "rt-n12p:green:wan";
+ gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+ };
+
+ lan {
+ label = "rt-n12p:green:lan";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+
+ power {
+ label = "rt-n12p:green:power";
+ gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+
Re: [LEDE-DEV] [FINAL CALL] Merging the 'OpenWrt merge' patches
On Fri, 8 Dec 2017, Felix Fietkau wrote: On 2017-12-07 15:55, Felix Fietkau wrote: Hi, Are there any remaining concerns about those 'OpenWrt merge' patches that have been sitting in my staging tree for a while now? If not, I plan on pushing them to master this weekend. Done. - Felix Great, thanks. Let's follow up with the infra parts - we had a short discussion with Jo on IRC about the download servers. Hauke, do you want to coordinate? Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] owrt landing page
Hi Thomas, The OpenWrt wiki is actually running on my box, so you'll need me for that. Let's catch up on IRC how to get the targz to you. Regards, Zoltan H On Sat, 6 Jan 2018, Thomas Endt wrote: Hi John, Since the styling is based on CSS, we would need the OpenWrt wiki's CSS for that. Once we have that, it will be relatively easy. But instead of doing the merge of the wikis step by step, I would suggest a hard cut. 1.) Make OpenWrt wiki read only -> I can do that or Imre 2.) Create .tgz of OpenWrt wiki and hand it over to LEDE wiki admins -> Imre 3.) Move LEDE wiki to OpenWrt styling (apply OpenWrt theme and CSS to LEDE wiki) -> I can do that. Some help of CSS experienced guys could be necessary for hard cases. 4.) Move content of old OpenWrt wiki to new OpenWrt wiki (former LEDE) -> I can take the toh part (devicepages); dataentries will be taken from LEDE since they are way more up to date and contain more datafields. -> Rest of the wiki: A plan needs to be worked out what will be carried over from old to new OpenWrt wiki -> Community discussion I'm in the starting blocks since weeks, waiting only for the GO and the OpenWrt wiki sources, and I'm sure, we will have some helping heands ready to start the wiki merge. Thomas -Ursprüngliche Nachricht- Von: Lede-dev [mailto:lede-dev-boun...@lists.infradead.org] Im Auftrag von John Crispin Gesendet: Freitag, 5. Januar 2018 18:54 An: LEDE Development List; LEDE Project Administration; OpenWrt Development List Betreff: [LEDE-DEV] owrt landing page Hi, could someone please help us with rebranding the lede landing page to an openwrt colour/theme ? i would like to see this swithced over within the next 7 days. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/5] firmware: add microcode package for AMD64
Signed-off-by: Zoltan HERPAI --- package/firmware/linux-firmware/x86.mk | 9 + 1 file changed, 9 insertions(+) create mode 100644 package/firmware/linux-firmware/x86.mk diff --git a/package/firmware/linux-firmware/x86.mk b/package/firmware/linux-firmware/x86.mk new file mode 100644 index 000..2dfe7b0 --- /dev/null +++ b/package/firmware/linux-firmware/x86.mk @@ -0,0 +1,9 @@ +Package/amd64-microcode = $(call Package/firmware-default,AMD64 CPU microcode) +define Package/amd64-microcode/install + $(INSTALL_DIR) $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd.bin $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd_fam15h.bin $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd_fam16h.bin $(1)/lib/firmware/amd-ucode +endef +$(eval $(call BuildPackage,amd64-microcode)) + -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 3/5] tools: add iucode-tool
Add tool to "compile" Intel microcode files. The tool will be compiled for host (to split the microcode.dat) and for target (to forcibly reload the microcode or scan the system if required). Signed-off-by: Zoltan HERPAI --- package/system/iucode-tool/Makefile | 47 + 1 file changed, 47 insertions(+) create mode 100644 package/system/iucode-tool/Makefile diff --git a/package/system/iucode-tool/Makefile b/package/system/iucode-tool/Makefile new file mode 100644 index 000..4381a3a --- /dev/null +++ b/package/system/iucode-tool/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2018 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=iucode-tool +PKG_VERSION:=2.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=iucode-tool_$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gitlab.com/iucode-tool/releases/raw/latest +PKG_HASH:=9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971 + +PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone + +PKG_MAINTAINER:=Zoltan HERPAI +PKG_LICENSE:=GPL-2.0 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk + +define Package/iucode-tool + SECTION:=utils + CATEGORY:=Base system + URL:=$(PKG_SOURCE_URL) + DEPENDS:=@TARGET_x86 + TITLE:=Intel microcode loader +endef + +define Package/iucode-tool/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/iucode_tool $(1)/usr/bin/ +endef + +define Host/Install + $(INSTALL_BIN) $(HOST_BUILD_DIR)/iucode_tool $(STAGING_DIR_HOST)/bin/iucode_tool +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,iucode-tool)) -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/5] x86: enable microcode loading for Intel and AMD
Enable for 4.9 and 4.14. Signed-off-by: Zoltan HERPAI --- target/linux/x86/config-4.14 | 5 - target/linux/x86/config-4.9 | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index b88fa77..9ea0d90 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -313,7 +313,10 @@ CONFIG_M586MMX=y # CONFIG_MFD_INTEL_LPSS_PCI is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set -# CONFIG_MICROCODE is not set +CONFIG_MICROCODE=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_OLD_INTERFACE=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9 index b500354..554e696 100644 --- a/target/linux/x86/config-4.9 +++ b/target/linux/x86/config-4.9 @@ -290,7 +290,10 @@ CONFIG_M586MMX=y # CONFIG_MFD_INTEL_LPSS_PCI is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set -# CONFIG_MICROCODE is not set +CONFIG_MICROCODE=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_OLD_INTERFACE=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 0/5] x86: add support for microcode update
Hi, This series will add support for microcode update on x86 targets, in light of the recent security issues. While other distributions use an early initramfs approach to update the microcode as early as possible, in OpenWrt the earliest place where we can do this is preinit. The Intel microcode package is using the source package by Debian, the AMD microcode package is downloaded from the linux-firmware git repository. This was tested on various Intel-based desktops with ancient BIOSes. Once the series is merged into trunk, this could/should be backported into 17.01 and 15.05 without too much hassle. Thanks, Zoltan H Zoltan HERPAI (5): x86: enable microcode loading for Intel and AMD firmware: add microcode package for AMD64 tools: add iucode-tool firmware: add microcode package for Intel packages: intel-microcode: update to 20180108 package/firmware/intel-microcode/Makefile | 51 ++ .../intel-microcode/files/intel-microcode.preinit | 8 package/firmware/linux-firmware/x86.mk | 9 package/system/iucode-tool/Makefile| 47 target/linux/x86/config-4.14 | 5 ++- target/linux/x86/config-4.9| 5 ++- 6 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 package/firmware/intel-microcode/Makefile create mode 100644 package/firmware/intel-microcode/files/intel-microcode.preinit create mode 100644 package/firmware/linux-firmware/x86.mk create mode 100644 package/system/iucode-tool/Makefile -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 5/5] packages: intel-microcode: update to 20180108
- update microcodes for various CPUs - Implements IBRS/IBPB support and enhances LFENCE: mitigation against Spectre (CVE-2017-5715) - downgrade microcodes for two platforms, due to reasons unknown from Intel Signed-off-by: Zoltan HERPAI --- package/firmware/intel-microcode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index 0af900c..962454e 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intel-microcode -PKG_VERSION:=20171215 +PKG_VERSION:=20180108 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/ -PKG_HASH:=eca8efc0a6dc456a8723204477e229577c1079fa5c1a10b6ba95d11e261ffa4d +PKG_HASH:=7a1a8bbbc6520be14e99fab40581c471861e8d731593447dfc9e9bd6b630712d PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_DEPENDS:=iucode-tool/host -- 1.9.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 4/5] firmware: add microcode package for Intel
Compiling the Intel microcode package results in a
microcode.bin and a microcode-64.bin. As we can
decide based on the subtarget which should be used,
we'll only split the required .bin file with
iucode-tool.
Instead of using the large microcode.bin/microcode-64.bin, the
splitted ucode files (separate for CPU families) will be
installed.
The microcodes are updated from preinit - that's the
earliest place where we can do it.
Signed-off-by: Zoltan HERPAI
---
package/firmware/intel-microcode/Makefile | 51 ++
.../intel-microcode/files/intel-microcode.preinit | 8
2 files changed, 59 insertions(+)
create mode 100644 package/firmware/intel-microcode/Makefile
create mode 100644
package/firmware/intel-microcode/files/intel-microcode.preinit
diff --git a/package/firmware/intel-microcode/Makefile
b/package/firmware/intel-microcode/Makefile
new file mode 100644
index 000..0af900c
--- /dev/null
+++ b/package/firmware/intel-microcode/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=intel-microcode
+PKG_VERSION:=20171215
+PKG_RELEASE:=1
+
+PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/
+PKG_HASH:=eca8efc0a6dc456a8723204477e229577c1079fa5c1a10b6ba95d11e261ffa4d
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE)
+
+PKG_BUILD_DEPENDS:=iucode-tool/host
+
+ifdef CONFIG_TARGET_x86_64
+ MICROCODE:="intel-microcode-64"
+else
+ MICROCODE:="intel-microcode"
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/intel-microcode
+ SECTION:=firmware
+ CATEGORY:=Firmware
+ URL:=$(PKG_SOURCE_URL)
+ DEPENDS:=@TARGET_x86 +iucode-tool
+ TITLE:=Intel x86 CPU microcode
+endef
+
+define Build/Compile
+ IUCODE_TOOL=$(STAGING_DIR)/../host/bin/iucode_tool $(MAKE) -C
$(PKG_BUILD_DIR)
+ mkdir $(PKG_BUILD_DIR)/intel-ucode
+ $(STAGING_DIR)/../host/bin/iucode_tool -q \
+ --write-firmware=$(PKG_BUILD_DIR)/intel-ucode
$(PKG_BUILD_DIR)/$(MICROCODE).bin
+endef
+
+define Package/intel-microcode/install
+ $(INSTALL_DIR) $(1)/lib/firmware/intel-ucode
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/intel-ucode/*
$(1)/lib/firmware/intel-ucode
+ $(INSTALL_DIR) $(1)/lib/preinit
+ $(INSTALL_BIN) ./files/intel-microcode.preinit
$(1)/lib/preinit/02_load_intel_ucode
+endef
+
+$(eval $(call BuildPackage,intel-microcode))
diff --git a/package/firmware/intel-microcode/files/intel-microcode.preinit
b/package/firmware/intel-microcode/files/intel-microcode.preinit
new file mode 100644
index 000..7f9279c
--- /dev/null
+++ b/package/firmware/intel-microcode/files/intel-microcode.preinit
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Copyright (C) 2018 OpenWrt.org
+
+do_load_intel_ucode() {
+ echo 1 > /sys/devices/system/cpu/microcode/reload
+}
+
+boot_hook_add preinit_main do_load_intel_ucode
--
1.9.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 2/5] firmware: add microcode package for AMD64
On Thu, 18 Jan 2018, Hauke Mehrtens wrote: On 01/17/2018 08:41 PM, Zoltan HERPAI wrote: Signed-off-by: Zoltan HERPAI --- package/firmware/linux-firmware/x86.mk | 9 + 1 file changed, 9 insertions(+) create mode 100644 package/firmware/linux-firmware/x86.mk diff --git a/package/firmware/linux-firmware/x86.mk b/package/firmware/linux-firmware/x86.mk new file mode 100644 index 000..2dfe7b0 --- /dev/null +++ b/package/firmware/linux-firmware/x86.mk @@ -0,0 +1,9 @@ +Package/amd64-microcode = $(call Package/firmware-default,AMD64 CPU microcode) +define Package/amd64-microcode/install + $(INSTALL_DIR) $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd.bin $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd_fam15h.bin $(1)/lib/firmware/amd-ucode + $(INSTALL_DATA) $(PKG_BUILD_DIR)/amd-ucode/microcode_amd_fam16h.bin $(1)/lib/firmware/amd-ucode +endef +$(eval $(call BuildPackage,amd64-microcode)) + These microcodes are still from 2016_03_16, Debian already ships some more recent versions which they got from Suse. Should we upgrade the linux-firmware package to the most recent version after these new microcodes are added and do the same for 17.01 and 15.05? See here for the Debain changelog: http://metadata.ftp-master.debian.org/changelogs/non-free/a/amd64-microcode/amd64-microcode_3.20171205.1_changelog Yes, this was discussed on IRC. My impression was that the linux-firmware git repo should be doing better than the distros in the first place, but looks like that's not the case, so I'll move to use the amd64-microcode from Debian. Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/5] x86: add support for microcode update
On Thu, 18 Jan 2018, Hauke Mehrtens wrote: On 01/18/2018 01:51 PM, Nick Lowe wrote: Does an update to the Kernel, 4.9.77 and 4.14.14 need to be made to properly address this? There are fixes to mitigate Spectre. We even need a patch for GCC which will be in GCC 8 and 7.3. For master we should backport it to GCC 5.5, but what do we want to do with 17.01 and 15.05 ? I'll speak only of CC - there is no microcode updater in it at all, so while 3.18 contains partial patches and GCC 4.8 is unlikely to get fixed, we should add this facility into it anyway. The AMD microcoded updater needs at least kernel 4.15, 4.14.13, 4.9.76, 4.4.111 which we already have. That's only for the fam17h (Zen) CPUs, earlier CPU types should work with earlier kernels, and this can likely be backported into 3.18. (I don't have a Zen-based box to test, hands up whoever has one.) Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/5] x86: add support for microcode update
John Crispin wrote: On 17/01/18 20:41, Zoltan HERPAI wrote: Hi, This series will add support for microcode update on x86 targets, in light of the recent security issues. While other distributions use an early initramfs approach to update the microcode as early as possible, in OpenWrt the earliest place where we can do this is preinit. due to the importance of this i would propose, that we add a dedicated step inside procd that calls right before preinit. Fine with me for trunk (and maybe 17.01) - can you add the sysfs poke then, please? For CC, which is currently at 2015-10-29, I think we can stay with running this from preinit. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] kernel version status
Hi, Michael Heimpold wrote: Hi, Am Sonntag, 18. Februar 2018, 22:43:42 CET schrieb Hauke Mehrtens: ... The following targets are on kernel 4.9 and are fine: ... * mxs ... a few weeks ago, I was in contact with Zoltan who started working on 4.14 support for mxs. I found some patches in his staging repo and added some patches on top. I've pushed this in a Github branch: https://github.com/mhei/source/tree/mxs-4.14 I run tested this on both I2SE Duckbill devices and Olimex OLinuXino Maxi boards - no obvious problems so far, so I think we can go ahead for this platform with 4.14. Thanks Michael, this is pushed to master now. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH] mvebu: disable CPU_IDLE as a Mamba instability workaround
Bjørn Mork wrote: Felix Fietkau writes: On 2018-03-19 10:51, Bjørn Mork wrote: A regression seriously affecting the Linksys WRT1900ACv1 (Mamba) was introduced some time between the OpenWrti/LEDE v4.4 and v4.9 kernels. The root cause has not yet been identified, despite many attempts for more than a year. However, disabling CPU_IDLE, and implicitly CPU_PM, has been proven to be an effective workaround. The symptoms on an affected system are unwanted reboots a a variable frequency. In many cases almost immediately after boot, causing a bootloop. This effectively disables support for Mamba on OpenWrt with kernels > v4.4. Disabling CPU_IDLE for now to reenable Mamba support. Link: https://forum.lede-project.org/t/wrt1900acv1-reboots-kernel-4-9/2025 Signed-off-by: Bjørn Mork Please try this variant instead, which should not affect unrelated devices: https://git.openwrt.org/0142d447bc02922369c363de6510e76848943e9a It's in my staging tree at https://git.openwrt.org/?p=openwrt/staging/nbd.git;a=summary Works for me. Thanks. Much better solution. Confirmed fixing the reboot problem on another Mamba. Regards, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] Package updates in the for-15.05 branch (libuv)
Karl Palsson wrote: [snip] I'm concerned that given the lack of release from both LEDE and OpenWrt, people are starting to treat the for-15.05 branch like a free for all "mainline" branch again. [snip] All, 15.05 should definitely not be treated as a "mainline" branch, neither in core nor in the packages tree. A security update-focused CC release can be expected sometime this year - bumping 3.18 to the latest, upgrading core packages and external packages, etc. -, but even without a release, the for-15.05 should contain security and bugfixes only. If there is a major bug in a package which needs to be fixed, a larger version jump can be accepted, but not for just the sake of jumping to the latest and shiniest. (Thanks Karl for bringing this up.) Thanks, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] Talks between OpenWrt and LEDE
Hi all, To clarify, the reason for integrating the OpenWrt patches into the LEDE tree is that in the future, at an agreed point in time for both parties, the OpenWrt trunk would be rebased from the LEDE tree, giving the community a "clean" trunk going forward. (Hopefully at that time, the "two parties" will be one.) Thanks Hauke for managing these talks and meetings. Regards, Zoltan H On Wed, 21 Dec 2016, Hauke Mehrtens wrote: We had multiple meetings to find a solution to solve the problems between the OpenWrt and the LEDE project and to discuss a possible merge. Everyone with commit access to LEDE and all OpenWrt core developers were invited to these meetings. We had productive and friendly discussions about the problems and our goals. To be more open and to involve the wider community in these discussions we would like to publish the meeting minutes from the meetings. The first in person meeting took place in Berlin at the OpenWrt Summit on 13. October 2016, but no one took any minutes so we do not have anything to publish. The second meeting was an audio conference on 5. November 2016 and Florian took minutes which are attached to this mail. At the third audio conference meeting on 3. December 2016 Jow took minutes which are also attached to this mail. The last meeting took place on 19. December 2016. These minutes are representing the current state of the discussions and are not PR polished. We agreed on giving Imre, Zoltan and Luka commit access to the LEDE repository so they can migrate changes they care about and which are not in LEDE, from the OpenWrt repository to the LEDE repository. We also encouraging everyone who sent a patch, which got merged into OpenWrt and which is not in LEDE to send it also to LEDE for integration. It is still not decided that both project will finally merge and we haven't decided on the name to use, which parts of the infrastructure and many other things. In general we are agreeing on many parts and I am looking forward to a good merged ending for all of us. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2 0/4] sunxi: rework image build and sysupgrade support
Hi Yousong, Yousong Zhou wrote: This series mainly tries achieve the following goals - use new image generation method - squashfs sdcard image support - mkfs.f2fs or mkfs.ext4 remaining space within squashfs rootfs partition and mount it as rw overlay - sysupgrade with fwtool check support Device profiles are automatically generated with a helper makefile. Names for image files, board_names, etc. are changed to try to use basename of kernel dts file for the specific device. Names for uboot-sunxi is not touched though. [snip] I'm OK with what these patches want to achieve. I had several patches prepared for similar purposes in sunxi (apart from the new image building code), but were never finalized due to responsibilities elsewhere, as one of the "obvious reasons" mentioned earlier (by Daniel IIRC). Whether you are merging these into trunk before or after your release and/or the merge, is obviously at your discretion. Having said that, if such major target reworks happen, and we seem to be geared towards a merge, it would be appreciated if you cc the openwrt-devel list so people over there would be aware. Thanks, Zoltan H ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] OpenWrt / LEDE
Hi, On 05/24/2016 10:31 PM, Hauke Mehrtens wrote: As it looks like the IRC meeting will not happen, because not so big interest by the people not already involved in LEDE and problems finding a time, lets discuss on the mailing list like suggested by Jow. The point you are missing is that some of the OpenWrt core team is living in a non-EU timezone. We can pick a PDT timeslot that won't work for anyone living in EU, and say that LEDE is not interested in the discussion, but that's just not the proper way. Currently it looks like only Luka is working on OpenWrt as he committed many patches from LEDE to OpenWrt, which is fine. It is one thing that there are no commits currently from anyone, until the OpenWrt/LEDE discussions are made. What will happen to the OpenWrt project? To me it looks like nobody except Luka is interested in working on OpenWrt. Are there any plans to continue the OpenWrt project or will it just die, only nobody wants to say it? See above. We don't plan to play dead. Also, IIRC there are patches for targets which are/were maintained by LEDE members. As far as I know, commit rights have not been revoked (somebody correct me if I'm wrong). Currently this is a bad situation for people that want to contribute patches because they do not exactly know were to contribute, some post them just to both list which is probably the best solution for the time we do not have a real solution. Yes, there might be some confusion about this, we are still lagging a bit behind due to the surprise fork. Luka sent a mail on some of the planned moves, please refer to that thread. (Jow, thanks for the buildbot-related number crunching.) I do not plan to contribute much to OpenWrt any more and I do not know if I can commit anything any more, at least it looks like I was kicked from the openwrt-hackers mailing list without informing me. I would like to see a reunion of LEDE and OpenWrt, so do any of the non LEDE but OpenWrt core devs have any problems with the LEDE rules and so on? This is my personal opinion and this was not somehow internally planned with other LEDE people. If I start a discussion about my employer-related topics along a beer with a couple friends, that's a private discussion with personal opinions. If I do it on any public channel, I can be felt to represent my employer on that topic. You seem to be representing LEDE. Regards, -w- ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
