Skip to content

[pull] main from openwrt:main#355

Merged
pull[bot] merged 17 commits intopowersoft123:mainfrom
openwrt:main
May 30, 2025
Merged

[pull] main from openwrt:main#355
pull[bot] merged 17 commits intopowersoft123:mainfrom
openwrt:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented May 30, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Noltari and others added 17 commits May 29, 2025 21:48
Switch to Linux kernel version 6.12.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Drop configs and patches for Linux 6.6.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
The initial 6.12 merge leaves package/zram menuconfig behaviour confusing.
Selecting "kmod-zram" opens a submenu of the available algorithms to build
and the actual algo to use. However, when "lzo-rle" is shown as the default
used, it still remains missing from the available list. Only enabling a
_different_ compression algo to build will also reveal "lzo-rle" as
available.

Update the Kconfig to show "lzo-rle" as available if used/referenced.

Fixes: 4708057 ("package/zram: update for kernel 6.12")
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Support new libpcap dependency and drop an old kernel version dependency.
Also improve formatting and avoid using unneeded deferred make variables.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This is an automatically generated commit.

When doing `git bisect`, consider `git bisect --skip`.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This is an automatically generated commit which aids following Kernel patch
history, as git will see the move and copy as a rename thus defeating the
purpose.

For the original discussion see:
https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Drop obsolete symbols GCC_ASM_GOTO_OUTPUT_WORKAROUND and HW_CONSOLE, and
PREEMPT_NONE_BUILD which is now set in top-level generic config.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
All four subtargets build successfully and run under QEMU.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: #18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Specifications:
- SoC: Allwinner H3 Quad Cortex-A7 1.2GHz
- Flash: 8GB eMMC
- RAM: 1GB DDR3
- Ethernet: 1x100M
- Wifi: RTL8189FTV or AP6181
- 1x USB-A Host
- 1x USB-A Host/Device
- 2x Button
- 2x LED
- HDMI, SPDIF, IR

Install by following standard SD card flashing instructions.
Image can also be flashed to eMMC.

Signed-off-by: Kyle Hendry <kylehendrydev@gmail.com>
Link: #18732
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Sort kernel configuration files alphabetically. Also resolve the
"CONFIG_ARM_PAN" conflict introduced in commit
057a0a0 ("generic: Fix up the v6.12 config for ARM"). Based on
the original PR comment[1], this symbol should be disabled by default.

[1] #18900 (comment)
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: #18947
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This symbol was lost when porting to the 6.12 kernel.

Fixes: 16b5a77 ("mediatek: mt7629: update config-6.12")
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: #18947
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This patch adds __nonstring annotation to address GCC15 with
-Wunterminated-string-initialization.
It is accepted in wireguard-linux in [1] and pending for v6.16
in [2].

[1] https://git.zx2c4.com/wireguard-linux/commit/?h=devel&id=71e5da46e78c1cd24e2feed251a2845327447ad8
[2] https://patch.msgid.link/20250521212707.1767879-3-Jason@zx2c4.com

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: #18950
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Backports an upstream fix ([1]) for a build regression of
'drivers/power/supply' with GCC15 -Wunterminated-string-initialization.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=77f5bb150132bbbcd6bc37ffdc80c9e140e373a4

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: #18950
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
The ucode-based wifi interface validation is based on `hostapd.conf`
specific options, which means it's missing the OpenWrt-specific
'network' property.

This causes schema validation warnings like:
```
daemon.notice netifd: radio1 (1340): wifi-scripts: network is not present in the schema
```

The description is taken from the OpenWrt wiki:
https://openwrt.org/docs/guide-user/network/wifi/basic#common_options1

Signed-off-by: Sean Khan <datapronix@protonmail.com>
Link: #18946
Signed-off-by: Robert Marko <robimarko@gmail.com>
If the uci 'dhcp' configuration for the dhcp leases is incorrect then
the call to 'ipclac' fails. However, the problem is that the dnsmasq
configuration option 'dhcp-range' is still written for this uci section
even though the information generated by ipcalc is incorrect or not set.

Due to the incorrectly generated configuration for dnsmasq, the service
cannot start.

To prevent an incorrect configuration from being written to the configuration,
a check is now made beforehand to ensure that the required variables are
present and valid. If the configuration is incorrect, a message is emitted
to the log that this configuration section is incorrect and this uci
configuration section is omitted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Link: #18641
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
The call to 'ipcalc' is used in 'dnsmasq' init script to create the
configuration. If the 'ipaddr' is in the configured range then 'ipcalc' exited
with an error whereby the START/STOP variables are unavailable.

This behaviour has changed during 'ipcalc' refactoring and now leads to a
problem when starting 'dnsmasq' if the 'ipaddr' is inside this range. To
restore the old behaviour, only a warning is issued as before and the
required variables for the 'dnsmasq' are still set.

Fixes: 854739b (base-files: ipcalc.sh: Rewrite in pure shell)

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Link: #18641
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Some modems and SIM cards take a bit longer to initialize after UIM has been
powered off. Waiting too little time can cause the qmi protocol to end up
in a loop repeatedly power-cycling the SIM card.

Avoid that by
 a) increasing the time we unconditionally sleep after --uim-power-on
 b) increasing the time we allow uqmi to wait for response for --uim-get-sim-state

Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
Link: #18772
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@pull pull bot added the ⤵️ pull label May 30, 2025
@pull pull bot merged commit d636636 into powersoft123:main May 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants