Re: [OpenWrt-Devel] OpenWrt 20.X release plans
On Wed, Jan 15, 2020 at 6:01 PM Hauke Mehrtens wrote: > > Hi, > > I meet with jow about 2 weeks ago and we talked about a lot of OpenWrt > related stuff, one of the topics was the release after 19.07. > > As the 19.07 release is now done, I would like to follow up on this topic. > > We thought that the time between the 19.07 branch and the final release > was way too long, this should be much shorter in the next release, we > should target 8 weeks for that. > > My preferred timeline would the the following: > * Beginning of February: freeze master for big changes (adding new > boards is no problem) > * Beginning of March: branch off 20.3 release branch > * 1 week after the branch was created: tag and build 20.3-rc1 > * 3 weeks later tag and build 20.3-rc2 > * 3 weeks later tag and build 20.3 final > > Then we would do the next final release in May 2020. > > This plan is based on using kernel 4.19, if we use kernel 5.4 I would > assume we have to shift all dates by 3 months, so branch off in > beginning of June and final release in August. > > Koen is working on adding generic 5.4 support and also some targets are > already ported, I assume the generic part should be finished soon: > https://git.openwrt.org/?p=openwrt/staging/xback.git;a=shortlog > > We had a longer discussion which kernel to use here: > https://lists.infradead.org/pipermail/openwrt-devel/2019-November/020403.html > There was also a discussion about this in IRC some days ago. > > I think we will get some years of LTS support for both versions, as > Android will probably use kernel 4.19 and 5.4 and then Google wants to > have LTS support from Greg Kroah-Hartman & Sasha Levin. Support for > kernel 4.19 was announced till December 2020, but it is used in Debian > and in the past Ben Hutchings took over and maintained Debian kernels > longer, like he still does for kernel 3.16. For previous kernel versions > the 5 year LTS support was also announced later. > > I am fine with kernel 4.19 or 5.4, but we should decide and not stay in > a limbo for log, so we can work io the right direction. > > If we decide for kernel 4.19 I am fine with adding kernel 5.4 support to > master and add it as testing kernel to some targets in master. We can > then branch off the next release in October with kernel 5.4. Good Evening, I know I'm relatively new to this community, so take my input with a grain of salt. I think it is wise to target 4.19 as it has been in the nightly releases, and as such has been in testing. Once that change is in place, target 5.4 for the nightly releases. This will allow 5.4 to be tested by those who are willing to run the bleeding edge, before the 21.x release. I must say though I'm sad with the 4/32 support loss, as I have openwrt on a Netgear WN3000RP v3, and with zram enabled it's orders of magnitude better than stock. > > It would be nice to have jails activated by default, but there are still > problems when using an initramfs, I will probably not have the time to > investigate into this problem in the next 4 weeks. > > Should wpad-openssl or better wpad-wolfssl (after it works with WPA3) be > added as default wpad version now? If we do this we can also activate > https support for luci by default https support should not cost much > space when we already have an ssl library. > > Are there any other bigger changes planned you would like to get into > the next release? It would be nice to have lxd support in the full release, instead of needing to custom build to enable support. > > Should we do a vote on the kernel version and release plan in the end? > The most important thing to get this done is that someone takes care and > does the branching, releasing and keeping an overview. > > Hauke > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] OpenWrt 20.X release plans
Hi, I meet with jow about 2 weeks ago and we talked about a lot of OpenWrt related stuff, one of the topics was the release after 19.07. As the 19.07 release is now done, I would like to follow up on this topic. We thought that the time between the 19.07 branch and the final release was way too long, this should be much shorter in the next release, we should target 8 weeks for that. My preferred timeline would the the following: * Beginning of February: freeze master for big changes (adding new boards is no problem) * Beginning of March: branch off 20.3 release branch * 1 week after the branch was created: tag and build 20.3-rc1 * 3 weeks later tag and build 20.3-rc2 * 3 weeks later tag and build 20.3 final Then we would do the next final release in May 2020. This plan is based on using kernel 4.19, if we use kernel 5.4 I would assume we have to shift all dates by 3 months, so branch off in beginning of June and final release in August. Koen is working on adding generic 5.4 support and also some targets are already ported, I assume the generic part should be finished soon: https://git.openwrt.org/?p=openwrt/staging/xback.git;a=shortlog We had a longer discussion which kernel to use here: https://lists.infradead.org/pipermail/openwrt-devel/2019-November/020403.html There was also a discussion about this in IRC some days ago. I think we will get some years of LTS support for both versions, as Android will probably use kernel 4.19 and 5.4 and then Google wants to have LTS support from Greg Kroah-Hartman & Sasha Levin. Support for kernel 4.19 was announced till December 2020, but it is used in Debian and in the past Ben Hutchings took over and maintained Debian kernels longer, like he still does for kernel 3.16. For previous kernel versions the 5 year LTS support was also announced later. I am fine with kernel 4.19 or 5.4, but we should decide and not stay in a limbo for log, so we can work io the right direction. If we decide for kernel 4.19 I am fine with adding kernel 5.4 support to master and add it as testing kernel to some targets in master. We can then branch off the next release in October with kernel 5.4. It would be nice to have jails activated by default, but there are still problems when using an initramfs, I will probably not have the time to investigate into this problem in the next 4 weeks. Should wpad-openssl or better wpad-wolfssl (after it works with WPA3) be added as default wpad version now? If we do this we can also activate https support for luci by default https support should not cost much space when we already have an ssl library. Are there any other bigger changes planned you would like to get into the next release? Should we do a vote on the kernel version and release plan in the end? The most important thing to get this done is that someone takes care and does the branching, releasing and keeping an overview. Hauke signature.asc Description: OpenPGP digital signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] wireguard: fix interface remove for lonely peers
On 05/12/2019 11:58, Florian Eckert wrote: +++ b/package/network/services/wireguard/Makefile @@ -93,6 +93,8 @@ define Package/wireguard-tools/install $(INSTALL_BIN) ./files/wireguard_watchdog $(1)/usr/bin/ $(INSTALL_DIR) $(1)/lib/netifd/proto/ $(INSTALL_BIN) ./files/wireguard.sh $(1)/lib/netifd/proto/ + $(INSTALL_DIR) $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/wireguard.init $(1)/etc/init.d/wireguard endef this code is not in the tree ?! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] wireguard: skip peer config if public key of the peer is not defined
On 05/12/2019 11:33, Florian Eckert wrote:
If a config section of a peer does not have a public key defined, the
whole interface does not start. The following log is shown
daemon.notice netifd: test (21071): Line unrecognized: `PublicKey='
daemon.notice netifd: test (21071): Configuration parsing erro
The command 'wg show' does only show the interface name.
With this change we skip the peer for this interface and emit a log
message. So the other peers get configured.
Signed-off-by: Florian Eckert
Merged, Thanks !
---
v2:
* Update error message to be a sentence
package/network/services/wireguard/files/wireguard.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/package/network/services/wireguard/files/wireguard.sh
b/package/network/services/wireguard/files/wireguard.sh
index 4c811c6ba9..ccac34e45f 100644
--- a/package/network/services/wireguard/files/wireguard.sh
+++ b/package/network/services/wireguard/files/wireguard.sh
@@ -42,6 +42,11 @@ proto_wireguard_setup_peer() {
config_get endpoint_port "${peer_config}" "endpoint_port"
config_get persistent_keepalive "${peer_config}" "persistent_keepalive"
+ if [ -z "$public_key" ]; then
+ echo "Skipping peer config $peer_config because public key is not
defined."
+ return 0
+ fi
+
echo "[Peer]" >> "${wg_cfg}"
echo "PublicKey=${public_key}" >> "${wg_cfg}"
if [ "${preshared_key}" ]; then
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2 0/4] ath79: add support for QCA9563-based Netgear WNDR routers
On 22/12/2019 21:50, Michal Cieslakiewicz wrote: This patchset introduces support for two Netgear dual-band routers based on the same PCB (29764821) with QCA9563 SoC, AR9580 5GHz chip, 128 MiB RAM, 2 MiB SPI-NOR + 128 MiB SPI-NAND flash: * Netgear WNDR4300 v2 * Netgear WNDR4500 v3 WNDR4300v2 has been tested successfully with this patchset applied to master branch. Since I have no access to 4500v3, configuration for this device is based on information provided by various websites, including abandoned ar71xx patch https://patchwork.ozlabs.org/patch/809227/ Note: technical wikis claim device is running CPU @ 750 MHz, while on my WNDR4300v2 both u-boot and OpenWrt report CPU clock value of 775 MHz. MAC address printed on device label is for LAN interface (ART offset 0x0). Patch #1 is a prerequisite and allows to unmask certain pins for ath9k-compatible wireless chips using Device Tree definition. Parameter is labelled "qca,gpio-mask" and accepts u32 value (see *_GPIO_MASK constants in ath9k/reg.h file). One of main reasons for blocking access to these pins is that they provide only one-way communication (in or out). Here - setting new mask to 0xf6ff (default one is 0xf4ff) enables RFKILL button wired to input pin 9. Merged, thanks ! Changes v1->v2: * kernel partition size increased from 2 MiB to 4 MiB for all Netgear WNDR routers with NAND flash, including AR9344 models (WNDR4300 and WNDR3700v4) already in master (patch 2/4 added) * dropped 'firmware' overlay partition Patch list (4): mac80211: ath9k: add GPIO mask dts property ath79: WNDR4300: increase kernel partition to 4M ath79: add support for Netgear WNDR4300 v2 ath79: add support for Netgear WNDR4500 v3 package/boot/uboot-envtools/files/ath79 | 2 + .../patches/ath/553-ath9k_of_gpio_mask.patch | 25 ++ .../linux/ath79/dts/ar9344_netgear_wndr.dtsi | 10 +- .../linux/ath79/dts/qca9563_netgear_wndr.dtsi | 256 ++ .../ath79/dts/qca9563_netgear_wndr4300-v2.dts | 19 ++ .../ath79/dts/qca9563_netgear_wndr4500-v3.dts | 41 +++ target/linux/ath79/image/nand.mk | 24 +- .../ath79/nand/base-files/etc/board.d/01_leds | 4 +- .../nand/base-files/etc/board.d/02_network| 8 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom| 8 +- 10 files changed, 386 insertions(+), 11 deletions(-) create mode 100644 package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr.dtsi create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts create mode 100644 target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] zram-swap: support swap priority
On 09/01/2020 19:27, Maxim Storchak wrote:
If zram-backed swap is added after an existing swap, it gets a lower
priority. Assiming that usually all other swaps are slower, there should
be a way to assign a higher priority to zram swap.
Signed-off-by: Maxim Storchak
Merged, thanks !
---
package/system/zram-swap/Makefile| 2 +-
package/system/zram-swap/files/zram.init | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/system/zram-swap/Makefile
b/package/system/zram-swap/Makefile
index bcada98a81..ee5e85927f 100644
--- a/package/system/zram-swap/Makefile
+++ b/package/system/zram-swap/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zram-swap
PKG_VERSION:=1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init
index ae432f3b00..49140ad406 100755
--- a/package/system/zram-swap/files/zram.init
+++ b/package/system/zram-swap/files/zram.init
@@ -172,6 +172,8 @@ start()
local zram_size="$( zram_getsize )"
local zram_dev="$( zram_getdev )"
zram_applicable "$zram_dev" || return 1
+ local zram_priority="$( uci -q get system.@system[0].zram_priority )"
+ zram_priority=${zram_priority:+-p $zram_priority}
logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)"
@@ -180,7 +182,7 @@ start()
zram_comp_streams "$zram_dev"
echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev"
)/disksize"
mkswap "$zram_dev"
- swapon "$zram_dev"
+ swapon $zram_priority "$zram_dev"
}
stop()
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ath79: add support for D-Link DIR-505
On 12/01/2020 20:20, David Bauer wrote:
This commit adds support for the D-Link DIR-505, previously supported in
ar71xx.
Hardware
SoC: Atheros AR9330
FLASH: 8M SPI-NOR
RAM: 64M
WIFI: 1T1R 1SS Atheros AR9330
LED: Power green, Status red
BTN: WPS, Reset
Installation
Currently, installation is only possible by sysupgrading from an earlier
OpenWrt version, U-Boot TFTP or a modded U-Boot. I do not have the
original bootloader from D-Link on my device anymore, so i cannot test
the factory image.
Signed-off-by: David Bauer
Merged, thanks !
---
.../linux/ath79/dts/ar9330_dlink_dir-505.dts | 149 ++
.../generic/base-files/etc/board.d/02_network | 4 +
.../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 +
target/linux/ath79/image/generic.mk | 10 ++
4 files changed, 164 insertions(+)
create mode 100644 target/linux/ath79/dts/ar9330_dlink_dir-505.dts
diff --git a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
new file mode 100644
index 00..6984176daa
--- /dev/null
+++ b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include
+#include
+
+#include "ar9330.dtsi"
+
+/ {
+ model = "D-Link DIR-505";
+ compatible = "dlink,dir-505", "qca,ar9330";
+
+ aliases {
+ serial0 =
+ led-boot = _power_green;
+ led-failsafe = _status_red;
+ led-running = _power_green;
+ led-upgrade = _status_red;
+ };
+
+ keys {
+ compatible = "gpio-keys";
+
+ wps {
+ label = "WPS button";
+ gpios = < 11 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
+
+ reset {
+ label = "Reset button";
+ gpios = < 12 GPIO_ACTIVE_HIGH>;
+ linux,code = ;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <_disable_pins>;
+
+ led_power_green: power {
+ label = "d-link:green:power";
+ gpios = < 27 GPIO_ACTIVE_LOW>;
+ };
+
+ led_status_red: status {
+ label = "d-link:red:status";
+ gpios = < 26 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+ {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+
+ led_enable {
+ gpio-hog;
+ output-low;
+ gpios = <1 GPIO_ACTIVE_LOW>;
+ line-name = "d-link:power:led";
+ };
+};
+
+ {
+ dr_mode = "host";
+ status = "okay";
+};
+
+_phy {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+
+ gmac-config {
+ device = <>;
+ switch-phy-addr-swap = <0>;
+ switch-phy-swap = <0>;
+ };
+};
+
+ {
+ compatible = "syscon", "simple-mfd";
+ status = "okay";
+};
+
+ {
+ num-chipselects = <1>;
+ status = "okay";
+
+ flash@0 {
+ compatible = "jedec,spi-nor";
+ spi-max-frequency = <5000>;
+ reg = <0>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x1>;
+ read-only;
+ };
+
+ art: partition@1 {
+ label = "art";
+ reg = <0x1 0x1>;
+ read-only;
+ };
+
+ mac: partition@2 {
+ label = "mac";
+ reg = <0x2 0x1>;
+ read-only;
+ };
+
+ partition@3 {
+ label = "nvram";
+ reg = <0x3 0x1>;
+ read-only;
+ };
+
+ partition@4 {
+ label = "language";
+ reg = <0x4 0x4>;
+ read-only;
+ };
+
+ partition@8 {
+ compatible = "denx,uimage";
+ label = "firmware";
+ reg = <0x8 0x78>;
+ };
+ };
+ };
+};
+
+ {
+ status = "okay";
+ qca,no-eeprom;
+};
diff --git
Re: [OpenWrt-Devel] [PATCH] perf: Add libunwind only if selected
On 22/12/2019 02:51, Rosen Penev wrote: The depends are totally wrong. libunwind does not work with powerpc and i386 as it needs glibc. Instead of duplicating the platforms, just change the dependency. Signed-off-by: Rosen Penev Merged, thanks ! --- package/devel/perf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile index 6f31c826e5..aa5fb16f60 100644 --- a/package/devel/perf/Makefile +++ b/package/devel/perf/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=perf PKG_VERSION:=$(LINUX_VERSION) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk define Package/perf SECTION:=devel CATEGORY:=Development - DEPENDS:= +libelf +libdw +(mips||mipsel||powerpc||i386||x86_64||arm||aarch64):libunwind +libpthread +librt +objdump @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS + DEPENDS:= +libelf +libdw +PACKAGE_libunwind:libunwind +libpthread +librt +objdump @!IN_SDK @!TARGET_arc770 @KERNEL_PERF_EVENTS TITLE:=Linux performance monitoring tool VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [openwrt] Patch notification: 5 patches updated
Hello, The following patches (submitted by you) have been updated in Patchwork: * openwrt: [OpenWrt-Devel,v3] dropbear: move failsafe code out of base-files - http://patchwork.ozlabs.org/patch/1197588/ - for: OpenWrt development was: New now: Accepted * openwrt: [OpenWrt-Devel,v2] dropbear: move failsafe code out of base-files - http://patchwork.ozlabs.org/patch/1192366/ - for: OpenWrt development was: New now: Superseded * openwrt: [OpenWrt-Devel] dropbear: move failsafe code out of base-files - http://patchwork.ozlabs.org/patch/1192364/ - for: OpenWrt development was: New now: Superseded * openwrt: [OpenWrt-Devel,1/2] hostapd: add dtim_period, local_pwr_constraint, spectrum_mgmt_required - http://patchwork.ozlabs.org/patch/1192362/ - for: OpenWrt development was: New now: Accepted * openwrt: [OpenWrt-Devel,2/2] hostapd: add wpa_strict_rekey support - http://patchwork.ozlabs.org/patch/1192361/ - for: OpenWrt development was: New now: Accepted This email is a notification only - you do not need to respond. Happy patchworking. -- This is an automated mail sent by the Patchwork system at patchwork.ozlabs.org. To stop receiving these notifications, edit your mail settings at: http://patchwork.ozlabs.org/mail/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/1] uhttpd: add enable instance option
On 07/11/2019 11:40, Florian Eckert wrote: With this change it is now possible to switch off single instances of the uhttpd config. Until now it was only possible to switch all instances of uhttpd on or off. Signed-off-by: Florian Eckert Merged, thanks ! --- package/network/services/uhttpd/Makefile | 2 +- package/network/services/uhttpd/files/uhttpd.init | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 85b7be7607..2d1fbf4492 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 6322473b97..869f79bea2 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -98,6 +98,10 @@ start_instance() local cfg="$1" local realm="$(uci_get system.@system[0].hostname)" local listen http https interpreter indexes path handler httpdconf haveauth + local enabled + + config_get_bool enabled "$cfg" 'enabled' 1 + [ $enabled -gt 0 ] || return procd_open_instance procd_set_param respawn ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] hostapd: add dtim_period, local_pwr_constraint, spectrum_mgmt_required
Merged, thanks ! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2] hostapd: add wpa_strict_rekey support
Merged, thanks ! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] build: define check-kernel-size to remove unflashable images
On 13/11/2019 22:09, Jeff Kletsky wrote:
From: Jeff Kletsky
Certain boards have limitations on U-Boot that prevent flashing
of images where the kernel size exceeds a threshold, yet
sysupgrade can sucessfully manage larger kernels. The current
check-size will remove the target artifact if its total size
exceeds the threshold. If applied after append-kernel,
it will remove the kernel, but the remaining image-assembly
steps will continue, resulting in an image without a kernel
that is likely unbootable.
By defining check-kernel-size, it is now possible to prevent release
of such unbootable images through a construct similar to:
IMAGE/factory.img := append-kernel | pad-to (GL_UBOOT_UBI_OFFSET) | \
append-ubi | check-kernel-size (GL_UBOOT_UBI_OFFSET)
Cc: Chuanhong Guo
Signed-off-by: Jeff Kletsky
Merged, thanks !
---
include/image-commands.mk | 7 +++
1 file changed, 7 insertions(+)
diff --git a/include/image-commands.mk b/include/image-commands.mk
index 5dfd6a2c2f..f561ad4669 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -271,6 +271,13 @@ define Build/check-size
}
endef
+define Build/check-kernel-size
+ @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1) -ge "$$(stat -c%s
$(IMAGE_KERNEL))" ] || { \
+ echo "WARNING: Kernel for $@ is too big > $(1)" >&2; \
+ rm -f $@; \
+ }
+endef
+
define Build/combined-image
-sh $(TOPDIR)/scripts/combined-image.sh \
"$(IMAGE_KERNEL)" \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v3] dropbear: move failsafe code out of base-files
Merged, thanks ! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] busybox: Include hdparm by default on nas type device
On 01/01/2020 16:55, Jo-Philipp Wich wrote: Hi Linus, can you move the condition before the sed program populating the initial config? That should restore the ability for users to deselect busybox hdparm (e.g. to replace it with something different). ~ Jo folded Jo's comment into the patch Merged, thanks ! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ath79: wlr-7100: use ath10k-ct smallbuffers package variant
On 14/01/2020 17:40, Tomasz Maciej Nowak wrote:
The memory hacks got removed from ath10k with 1e27bef ("mac80211: remove
ath10k_pci memory hacks"). As this device has low amount of RAM, switch
to ath-10k-ct small buffers variant, to avoid the OOM Reaper.
Signed-off-by: Tomasz Maciej Nowak
Thanks, merged !
---
target/linux/ath79/image/generic.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/linux/ath79/image/generic.mk
b/target/linux/ath79/image/generic.mk
index 18dad80d5d..abc6f96a80 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -986,7 +986,7 @@ define Device/sitecom_wlr-7100
DEVICE_VENDOR := Sitecom
DEVICE_MODEL := WLR-7100
DEVICE_VARIANT := v1 002
- DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k kmod-usb2
+ DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct-smallbuffers
kmod-usb2
IMAGES += factory.dlf
IMAGE/factory.dlf := append-kernel | pad-to (BLOCKSIZE) | \
append-rootfs | pad-rootfs | check-size (IMAGE_SIZE) | \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] iwinfo: 64-bit byte counters for assoclist
On 10/01/2020 15:27, Dainis Jonitis wrote:
When available, use 64-bit byte counters rx/tx_bytes64. New 32-bit
counters rx/tx_bytes32 are guaranteed to clamp to max 32-bit value
and never wrap around. For compatibility with legacy clients the old
values rx/tx_bytes are just aliases of new rx/tx_bytes32.
Signed-off-by: Dainis Jonitis
Merged, Thanks !
---
include/iwinfo.h | 12 ++--
iwinfo_nl80211.c | 24
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/include/iwinfo.h b/include/iwinfo.h
index 5e64294..8610fcb 100644
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -119,8 +119,16 @@ struct iwinfo_assoclist_entry {
uint64_t rx_drop_misc;
struct iwinfo_rate_entry rx_rate;
struct iwinfo_rate_entry tx_rate;
- uint32_t rx_bytes;
- uint32_t tx_bytes;
+ uint64_t rx_bytes64;
+ uint64_t tx_bytes64;
+ union {
+ uint32_t rx_bytes32;/* clamped to max uint32_t */
+ uint32_t rx_bytes; /* OBSOLETED: alias for legacy clients*/
+ };
+ union {
+ uint32_t tx_bytes32;/* clamped to max uint32_t */
+ uint32_t tx_bytes; /* OBSOLETED: alias for legacy clients*/
+ };
uint32_t tx_retries;
uint32_t tx_failed;
uint64_t t_offset;
diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index 2b2a043..6b35888 100644
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -1953,6 +1953,8 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg,
void *arg)
[NL80211_STA_INFO_SIGNAL_AVG]= { .type = NLA_U8 },
[NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32},
[NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32},
+ [NL80211_STA_INFO_RX_BYTES64]= { .type = NLA_U64},
+ [NL80211_STA_INFO_TX_BYTES64]= { .type = NLA_U64},
[NL80211_STA_INFO_TX_RETRIES]= { .type = NLA_U32},
[NL80211_STA_INFO_TX_FAILED] = { .type = NLA_U32},
[NL80211_STA_INFO_CONNECTED_TIME]= { .type = NLA_U32},
@@ -2016,11 +2018,25 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg,
void *arg)
sinfo[NL80211_STA_INFO_TX_BITRATE],
rate_policy))
nl80211_parse_rateinfo(rinfo, >tx_rate);
- if (sinfo[NL80211_STA_INFO_RX_BYTES])
- e->rx_bytes =
nla_get_u32(sinfo[NL80211_STA_INFO_RX_BYTES]);
+ if (sinfo[NL80211_STA_INFO_RX_BYTES64]) {
+ uint64_t u64 =
nla_get_u64(sinfo[NL80211_STA_INFO_RX_BYTES64]);
+ e->rx_bytes64 = u64;
+ e->rx_bytes32 = (u64 <= UINT32_MAX) ? (uint32_t)u64 :
UINT32_MAX;
+ } else if (sinfo[NL80211_STA_INFO_RX_BYTES]) {
+ uint32_t u32 =
nla_get_u32(sinfo[NL80211_STA_INFO_RX_BYTES]);
+ e->rx_bytes32 = u32;
+ e->rx_bytes64 = u32;
+ }
- if (sinfo[NL80211_STA_INFO_TX_BYTES])
- e->tx_bytes =
nla_get_u32(sinfo[NL80211_STA_INFO_TX_BYTES]);
+ if (sinfo[NL80211_STA_INFO_TX_BYTES64]) {
+ uint64_t u64 =
nla_get_u64(sinfo[NL80211_STA_INFO_TX_BYTES64]);
+ e->tx_bytes64 = u64;
+ e->tx_bytes32 = (u64 <= UINT32_MAX) ? (uint32_t)u64 :
UINT32_MAX;
+ } else if (sinfo[NL80211_STA_INFO_TX_BYTES]) {
+ uint32_t u32 =
nla_get_u32(sinfo[NL80211_STA_INFO_TX_BYTES]);
+ e->tx_bytes32 = u32;
+ e->tx_bytes64 = u32;
+ }
if (sinfo[NL80211_STA_INFO_TX_RETRIES])
e->tx_retries =
nla_get_u32(sinfo[NL80211_STA_INFO_TX_RETRIES]);
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Merged: cryptodev-linux: remove DEFAULT redefinition
Merged into my staging tree at http://git.openwrt.org/?p=openwrt/staging/jow.git. Thank you! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] cryptodev-linux: remove DEFAULT redefinition
The 'DEFAULT:=m if ALL' line prevents the phase1 buildbots from building the package, and users from downloading it, since they use 'ALL_KMODS=y' but 'ALL' is not set. Signed-off-by: Eneas U de Queiroz -- This was reported here: https://github.com/openwrt/packages/issues/10987 This should be cherry-picked to openwrt-19.07 as well. Note that in 18.06, to actually be able to use cryptodev, you'd have to custom-build openssl (or gnutls), since the engine was always built into the main library. Therefore there's little benefit in applying this patch. From 19.07, the openssl devcrypto engine is built into a separate package, which has kmod-cryptodev as a dependency. It was compile/behavior-tested on mvebu and using the ramips-mt7620 SDK. I decided not to bump PKG_RELEASE, since this does not change the package, just whether it gets built or not. diff --git a/package/kernel/cryptodev-linux/Makefile b/package/kernel/cryptodev-linux/Makefile index 2a8890286d..9bea63ebd1 100644 --- a/package/kernel/cryptodev-linux/Makefile +++ b/package/kernel/cryptodev-linux/Makefile @@ -27,7 +27,6 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/cryptodev SUBMENU:=Cryptographic API modules - DEFAULT:=m if ALL TITLE:=Driver for cryptographic acceleration URL:=http://cryptodev-linux.org/ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH procd v2] instance: fix pidfile attribute double free crash
Commit a5af33ce9a16 ("instance: strdup string attributes") has
introduced duplication of various string attributes in order to fix
use-after-free, but missed handling of `pidfile` and `seccomp` attribute
cases in instance_config_move() where the new value of `pidfile` or
`seccomp` is being copied/assigned. Source of this values is then
free()d in subsequent call to instance_free() and then again for 2nd
time during the service stop command handling, leading to double free
crash:
#0 unmap_chunk at src/malloc/malloc.c:515
#1 free at src/malloc/malloc.c:526
#2 instance_free (in=0xd5e300) at instance.c:1100
#3 instance_delete (in=0xd5e300) at instance.c:559
#4 instance_stop (in=0xd5e300, halt=true) at instance.c:611
Ref: FS#2723
Cc: Daniel Golle
Fixes: a5af33ce9a16 ("instance: strdup string attributes")
Signed-off-by: Petr Štetiar
---
changes since v1:
* added missed fix for `seccomp` attribute (Daniel)
service/instance.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/service/instance.c b/service/instance.c
index ce5233807dbb..8fd44a80d6e5 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -1031,17 +1031,23 @@ instance_config_move(struct service_instance *in,
struct service_instance *in_sr
blobmsg_list_move(>jail.mount, _src->jail.mount);
in->trigger = in_src->trigger;
in->command = in_src->command;
- in->pidfile = in_src->pidfile;
in->respawn = in_src->respawn;
in->respawn_retry = in_src->respawn_retry;
in->respawn_threshold = in_src->respawn_threshold;
in->respawn_timeout = in_src->respawn_timeout;
in->name = in_src->name;
in->trace = in_src->trace;
- in->seccomp = in_src->seccomp;
in->node.avl.key = in_src->node.avl.key;
in->syslog_facility = in_src->syslog_facility;
+ free(in->pidfile);
+ if (in_src->pidfile)
+ in->pidfile = strdup(in_src->pidfile);
+
+ free(in->seccomp);
+ if (in_src->seccomp)
+ in->seccomp = strdup(in_src->seccomp);
+
free(in->config);
in->config = in_src->config;
in_src->config = NULL;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] New OpenWrt logo proposal [Was: Re: [RFC]new "corporate identity" for OpenWrt & static rendering]
In hopes of guiding this conversation toward the forum, I reposted Nishant Sharma's comment there... https://forum.openwrt.org/t/help-pre-select-new-openwrt-project-logo-in-the-poll/52674/9 > On Jan 15, 2020, at 12:00 AM, Nishant Sharma wrote: > > Hi Petr, > > On 14/01/20 4:57 PM, Petr Štetiar wrote: >> Petr Štetiar [2020-01-08 22:47:28]: >> >> 1. >> https://forum.openwrt.org/t/help-pre-select-new-openwrt-project-logo-in-the-poll/52674 > > All of them are nice and I have voted for the one I liked. I have a > thought here. > > As far as I see and use, OpenWrt doesn't stand just for wireless > freedom, though that's the most popular use case. It is being used as a > base for various functions related but not limited to meshing, routing, > network security, IoT and anything or everything that one can imagine or > implement with additional packages. It gives us such a "freedom" and > helps us protect our "privacy". > > The logo "H" represents the versatility, but misses the wireless. > > Regards, > Nishant > > ___ > openwrt-adm mailing list > openwrt-...@lists.openwrt.org > http://lists.infradead.org/mailman/listinfo/openwrt-adm ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH procd 2/2] instance: fix pidfile attribute double free crash
Hi Petr,
thanks for reviewing and fixing this!
On Wed, Jan 15, 2020 at 11:30:57AM +0100, Petr Štetiar wrote:
> Commit a5af33ce9a16 ("instance: strdup string attributes") has
> introduced duplication of various string attributes in order to fix
> use-after-free, but missed handling of one `pidfile` attribute case in
> instance_config_move() where the new value of `pidfile` is being
> copied/assigned. Source of this value is then free()d in following call
> to instance_free() and then again for 2nd time during the service stop
> command handling, leading to double free crash:
>
> #0 unmap_chunk at src/malloc/malloc.c:515
> #1 free at src/malloc/malloc.c:526
> #2 instance_free (in=0xd5e300) at instance.c:1100
> #3 instance_delete (in=0xd5e300) at instance.c:559
> #4 instance_stop (in=0xd5e300, halt=true) at instance.c:611
Right, didn't think about that. I don't have time to get into this
right now (but will have tonight or tomorrow), but doesn't the same
also apply at least for the 'seccomp' field?
Cheers
Daniel
>
> Ref: FS#2723
> Cc: Daniel Golle
> Fixes: a5af33ce9a16 ("instance: strdup string attributes")
> Signed-off-by: Petr Štetiar
> ---
> service/instance.c | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/service/instance.c b/service/instance.c
> index ce5233807dbb..245b9629d99a 100644
> --- a/service/instance.c
> +++ b/service/instance.c
> @@ -1031,7 +1031,6 @@ instance_config_move(struct service_instance *in,
> struct service_instance *in_sr
> blobmsg_list_move(>jail.mount, _src->jail.mount);
> in->trigger = in_src->trigger;
> in->command = in_src->command;
> - in->pidfile = in_src->pidfile;
> in->respawn = in_src->respawn;
> in->respawn_retry = in_src->respawn_retry;
> in->respawn_threshold = in_src->respawn_threshold;
> @@ -1042,6 +1041,10 @@ instance_config_move(struct service_instance *in,
> struct service_instance *in_sr
> in->node.avl.key = in_src->node.avl.key;
> in->syslog_facility = in_src->syslog_facility;
>
> + free(in->pidfile);
> + if (in_src->pidfile)
> + in->pidfile = strdup(in_src->pidfile);
> +
> free(in->config);
> in->config = in_src->config;
> in_src->config = NULL;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH procd 1/2] instance: fix typo in error message
Fixes `removed` to proper `remove` in "Failed to removed pidfile".
Fixes: b12bb150ed38 ("procd: service: Support writing pidfiles")
Signed-off-by: Petr Štetiar
---
service/instance.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/service/instance.c b/service/instance.c
index b0c98079d5b9..ce5233807dbb 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -270,7 +270,7 @@ instance_removepid(struct service_instance *in) {
if (!in->pidfile)
return 0;
if (unlink(in->pidfile)) {
- ERROR("Failed to removed pidfile: %s: %m\n", in->pidfile);
+ ERROR("Failed to remove pidfile: %s: %m\n", in->pidfile);
return 1;
}
return 0;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH procd 2/2] instance: fix pidfile attribute double free crash
Commit a5af33ce9a16 ("instance: strdup string attributes") has
introduced duplication of various string attributes in order to fix
use-after-free, but missed handling of one `pidfile` attribute case in
instance_config_move() where the new value of `pidfile` is being
copied/assigned. Source of this value is then free()d in following call
to instance_free() and then again for 2nd time during the service stop
command handling, leading to double free crash:
#0 unmap_chunk at src/malloc/malloc.c:515
#1 free at src/malloc/malloc.c:526
#2 instance_free (in=0xd5e300) at instance.c:1100
#3 instance_delete (in=0xd5e300) at instance.c:559
#4 instance_stop (in=0xd5e300, halt=true) at instance.c:611
Ref: FS#2723
Cc: Daniel Golle
Fixes: a5af33ce9a16 ("instance: strdup string attributes")
Signed-off-by: Petr Štetiar
---
service/instance.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/service/instance.c b/service/instance.c
index ce5233807dbb..245b9629d99a 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -1031,7 +1031,6 @@ instance_config_move(struct service_instance *in, struct
service_instance *in_sr
blobmsg_list_move(>jail.mount, _src->jail.mount);
in->trigger = in_src->trigger;
in->command = in_src->command;
- in->pidfile = in_src->pidfile;
in->respawn = in_src->respawn;
in->respawn_retry = in_src->respawn_retry;
in->respawn_threshold = in_src->respawn_threshold;
@@ -1042,6 +1041,10 @@ instance_config_move(struct service_instance *in, struct
service_instance *in_sr
in->node.avl.key = in_src->node.avl.key;
in->syslog_facility = in_src->syslog_facility;
+ free(in->pidfile);
+ if (in_src->pidfile)
+ in->pidfile = strdup(in_src->pidfile);
+
free(in->config);
in->config = in_src->config;
in_src->config = NULL;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH fstools] libblkid-tiny: fix f2fs labels by increasing label buffer
f2fs max label length is 1024B (512 * uint16_t) which is way above current 256B used in `struct blkid_struct_probe` which renders labels on f2fs system unusable: $ mkfs.f2fs -l drive /dev/sda1 $ block info /dev/sda1 label buffer too small 1024 > 255 So increase the label buffer again in order to make enough space for f2fs labels. Fixes: FS#2735 Signed-off-by: Petr Štetiar --- libblkid-tiny/libblkid-tiny.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libblkid-tiny/libblkid-tiny.h b/libblkid-tiny/libblkid-tiny.h index f0922b5f7aeb..e476e7b2c6ef 100644 --- a/libblkid-tiny/libblkid-tiny.h +++ b/libblkid-tiny/libblkid-tiny.h @@ -56,7 +56,7 @@ struct blkid_struct_probe int err; chardev[32]; charuuid[64]; - charlabel[256]; + charlabel[1025]; charversion[64]; struct list_headbuffers;/* list of buffers */ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
