[24.10] RFC: backport changes from main and remove USE_APK config option #17097
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ynezz
added
the
release/24.10
github-actions
bot
added
target/apm821xx
These packages are needed for the stm32/stm32mp1 subtarget. Signed-off-by: Thomas Richard <[email protected]> Link: openwrt#16716 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit e109831) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
New stm32 target introduces support for stm32mp1 based devices. For now it includes an initial support of the STM32MP135F-DK device. The specifications bellow only list supported features. Specifications -------------- SOC: STM32MP135FAF7 RAM: 512 MiB Storage: SD Card Ethernet: 2x 100 Mbps Wireless: 2.4GHz Cypress CYW43455 (802.11b/g/n) LEDs: Heartbeat (Blue) Buttons: 1x Reset, 1x User (USER2) USB: 4x 2.0 Type-A Signed-off-by: Thomas Richard <[email protected]> Link: openwrt#16716 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 851e7f7) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Netatalk v4 reintroduces AppleTalk and this module is required for layer 3 protocol support. Module was removed in kernel 4.14 for OpenWrt 18.06 (commmit 14a0131, 22/02/2018). At the time nothing used it as Netatalk v3 did not support AppleTalk. Not building ipddp feature/module like it was in the past, as recommended by upstream Netatalk maintainers. Signed-off-by: Antonio Pastor <[email protected]> Link: openwrt#16979 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 5eb25dd) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
small change. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#16913 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 5564439) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
It's common to avoid calling mutex_destroy when done. It's not correct strictly speaking. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#16753 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 6280b4a) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
The Zbtlink ZBT-WE2426-B is an indoor dual band WiFi router with 4 external non detachable antennas and 5 Fast Ethernet ports. Hardware of ZBT-WE2426-B: - SoC: MT7628AN - RAM: 64 MB (Winbond W9751G6K8-25) - Storage: 8 MB SPI flash (S25FL064K) - Ethernet: 5x 10/100 Mbps LAN1,LAN2,LAN3,LAN4 & WAN - Wireless: 2.4GHz: on SoC (802.11b/g/n) - Wireless: 5GHz: Mediatek MT7612EN (802.11n/ac) - LEDs: 8x - Buttons: 1x reset - USB: 1x 2.0 - MicroSD slot: 1x - Power: 9 VDC, 1 A - Uart: GND TX RX PWR - J1 on the PCB - Board silkscreen: "ZBT-WE2426-C V04" "2018-02-28" "CTT" "13 18" Backup the stock firmware, settings and calibration data: This router comes with PandoraBox OpenWrt firmware, so it is possible to get all MTD partitions using scp. Installation: - Using the bootloader web server. Hold the reset button while turning the power on. Upload the sysupgrade image on http://192.168.1.1. - Using the sysupgrade command in PandoraBox OpenWrt. LEDs: - LAN1,LAN2,LAN3,LAN4,WAN,WLAN2G use GPIO pins of the MT7628AN SoC (GPIOs 43,42,41,40,39,44) - WLAN5G uses pin of MT7612EN. - The POWER LED is directly connected to the VCC. It can be reconnected to the GPIO 37 of the MT7628AN SoC by resoldering SMD resistor on the PCB. Buttons: - The RESET button is connected to the GPIO 38 of the MT7628AN SoC. MAC addresses as verified by OEM firmware: use address source 2g *:b0 factory 0x4 (label) 5g *:b1 factory 0x8004 LAN *:b2 factory 0x28 WAN *:b3 factory 0x2e Signed-off-by: Vaclav Svoboda <[email protected]> Link: openwrt#16927 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 3a9752e) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
This is done in preparation of adding support for the CPE710-v2, which uses a similiar device tree. Signed-off-by: Tim Noack <[email protected]> Link: openwrt#16637 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 832cc8c) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
TP-Link CPE710-v2 is an outdoor wireless CPE for 5 GHz with one Ethernet port based on the AP152 reference board. Compared to the CPE710-v1, the only change observed in hardware is that the mdio address of the ethernet physical changed from 0x4 to 0x0. Specifications: - SoC: QCA9563-AL3A MIPS 74kc @ 775MHz, AHB @ 258MHz - RAM: 128MiB DDR2 @ 650MHz - Flash: 16MiB SPI NOR Based on the GD25Q128 - Wi-Fi 5Ghz: ath10k chip (802.11ac for up to 867Mbps on 5GHz wireless data rate), based on the QCA9896 - Ethernet: one 1GbE port - 23dBi high-gain directional 2×2 MIMO parabolic antenna - Power, LAN, WLAN5G Blue LEDs Flashing instructions: Flash factory image through stock firmware WEB UI or through TFTP To get to TFTP recovery just hold reset button while powering on for around 30-40 seconds and release. Rename factory image to recovery.bin Stock TFTP server IP:192.168.0.100 Stock device TFTP address:192.168.0.254 Signed-off-by: Tim Noack <[email protected]> Link: openwrt#16637 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 5572e01) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Add support for Intel AX411 CNVio2 device. Signed-off-by: Joerg Bayer <[email protected]> Link: openwrt#15153 [squashed and updated commit description, update to version 89] Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit c89ed7a) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
In order to prepare OpenWrt support for other Acer W6 devices, this commit moves all device tree components that are used by all Acer W6/W6e/W6d/W6m routers from mt7986a-acer-predator-w6.dts to mt7986a-acer-w6-common.dtsi (new file) and includes this dtsi file in mt7986a-acer-predator-w6.dts. Minor changes had to be made to the device tree in order to improve clarity and – notably – to reduce the number of dtc warnings: - replace (obviously wrong) led@<N> gpio led entities by led-<N> - remove unnecessary (default-state = "off") gpio led statements - rename entity “memory” to “memory@0” - add missing #address-cells and #address-size in /soc/mmc@11230000 - add missing #address-cells and #address-size in /soc/pcie@11280000 - introduce symbols “nvmem” and “swport0” in dtsi (referenced in dts) The changes were checked with `diff -BEZbdtwy --suppress-common-lines ...` (comparing two dts files created using old and new fdt-1 blobs again), see openwrt#16861 . This is the first of four commits into which the original commit was split to make reviews easier and more targeted. Signed-off-by: George Oldfort <[email protected]> Link: openwrt#16861 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit ce3b36b) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
In order to prepare OpenWrt support for other Acer W6 devices and to adapt the procedure to read and set mac addresses which other devices of the same target are using (instead of needing an additional script and creating an additional structure in the file system), this commit - reads device mac addresses from u-boot environment - avoids the detour via the file system to set the mac addresses - drops redundant file /lib/preinit/05_extract_factory_data.sh The idea and the implementation were thankfully taken from PR openwrt#16410. This is the second of four commits into which the original commit was split to make reviews easier and more targeted. Signed-off-by: George Oldfort <[email protected]> Link: openwrt#16861 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit e7aaba2) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
In order to prepare for OpenWrt support other Acer W6 devices and to get
a step further to full hardware support for Acer Predator Connect W6, this
commit
- adjusts the product name ("Acer Predator Connect W6")
- updates gpio LED labels to function/color scheme
- show router status by using first rgb led instead of it's red color only
(blue: booting/failsafe mode; red: sysupgrade; green: running – was: red)
- changes switch/eth1 led configuration to reflect RX/TX activity and speed
(green: full 1Gbps/2.5Gbps speed; amber: lower speed; blink: RX/TX)
- shortens dummy dm-mod.create string in bootargs
- enables W6's i2c interface
This is the third of four commits into which the original commit was split
to make reviews easier and more targeted.
Signed-off-by: George Oldfort <[email protected]>
Link: openwrt#16861
Signed-off-by: Hauke Mehrtens <[email protected]>
(cherry picked from commit d42075d)
Link: openwrt#17097
Signed-off-by: Petr Štetiar <[email protected]>
This commit adds support for two variants of the already supported router Acer Predator Connect W6: The Acer Predator Connect W6d (W6 without 6 GHz wifi) and the Acer Connect Vero W6m (W6 without 2.5G eth1 port, usb3 port, and the 6 on-board gpio RGB LEDs, and with a KTD2026 RGB LED controller instead of the KTD2061 LED controller of the W6/W6d). The device tree for the W6m refers to the KTD202x driver suggested in PR openwrt#16860. Patching target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh removes the code repetition in (old) lines 121 to 124 on the occasion. This is the last of four commits into which the original commit was split to make reviews easier and more targeted. Signed-off-by: George Oldfort <[email protected]> Link: openwrt#16861 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 2898d1d) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Hardware -------- MediaTek MT7981 WiSoC 256MB DDR3 RAM 128MB SPI-NAND (XMC XM25QH128C) MediaTek MT7981 2x2 DBDC 802.11ax 2T2R (2.4 / 5) UART: 115200 8N1 3.3V MAC: LAN MAC: label mac WAN MAC: label mac + 1 2.4G MAC: label mac 5G MAC: label mac + 1 with LA bit set Installation ------------ 1. Connect to the serial port as described in the "Hardware" section. 2. Power on the device + press reset pin. Keep pressing reset pin to enter the U-Boot shell. 3. Download the OpenWrt initramfs image. Place it on an TFTP server connected to the Cudy LAN ports. Make sure the server is reachable at 192.168.1.88. Rename the image to "cudy3000s.bin" 4. Download and boot the OpenWrt initramfs image. $ tftpboot 0x46000000 cudy3000s.bin; bootm 0x46000000 5. Transfer the OpenWrt sysupgrade image to the device using scp. Install with sysupgrade. Signed-off-by: David Ignjic <[email protected]> Link: openwrt#16939 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit faf4b3e) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Deactivate CONFIG_CONTEXT_TRACKING_USER_FORCE: Force user context tracking: This is a testing feature which should not be activate in production environments according to the Kconfig help. It adds an extra overhead. Deactivate CONFIG_RCU_NOCB_CPU_DEFAULT_ALL: Offload RCU callback processing from all CPUs by default: This option should only be used in aggressive HPC or real-time workloads which we do not have in OpenWrt. For normal workloads it increases the number of context switches. In the default Arch Linux kernel both options are not activated. Fixes: 3111168 ("x86: switch config to a tickless kernel") Link: openwrt#17057 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit ed52345) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
- update dropbear to latest stable 2024.86; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES Link: openwrt#17053 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit a9d3c5b) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Add a label for changes in the stm32 target. Fixes: 851e7f7 ("stm32: add new stm32 target") Link: openwrt#17058 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit eb7aa07) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
These options are filtered out since some weeks, remove them also from the new stm32 target. Fixes: 851e7f7 ("stm32: add new stm32 target") Link: openwrt#17058 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit ea2c860) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Change the dependency on the kmod-media-controller from depends to select. Fixes: 1095925 ("kernel: add kmod-media-controller dependency for kmod-usb-audio") Link: openwrt#17058 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit b7dd70a) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
The mt76x8 series SoCs use the MIPS generic systick timer. Sync the upstream Ralink systick driver changes and disable it for mt76x8 target to reduce the kernel size. Signed-off-by: Shiji Yang <[email protected]> Link: openwrt#16844 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 0c57510) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Code cleanup. Simplify and unify how kernel image is passed to Build/dna-bootfs Signed-off-by: Mauri Sandberg <[email protected]> Link: openwrt#16811 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit ec839c7) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Add U-Boot replacement loader for Routerich AX3000. Signed-off-by: Mikhail Zhilkin <[email protected]> Link: openwrt#16791 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit c058152) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
This commit adds OpenWrt U-Boot layout support for Routerich AX3000. The aims: 1. Get open-source U-Boot; 2. Get maximum available free space in OpenWrt. Install ------- 1. Copy OpenWrt ubootmod-bl31-uboot.fip, ubootmod-preloader.bin, to the /tmp folder of the router using scp. 2. Make mtd partitions backups: http://192.168.1.1/cgi-bin/luci/admin/system/flash -> Save mtdblock contents 3. Install kmod-mtd-rw: ``` opkg update && opkg install kmod-mtd-rw ``` 4. Write FIP and preloader: ``` insmod mtd-rw i_want_a_brick=1 mtd unlock BL2 mtd erase BL2 mtd write /tmp/ubootmod-preloader.bin BL2 mtd unlock FIP mtd erase FIP mtd write /tmp/ubootmod-bl31-uboot.fip FIP ``` 5. Copy OpenWrt ubootmod-initramfs-recovery.itb to the tftp server root with IP 192.168.1.254. 6. Reboot router: ``` reboot ``` U-Boot will automatically download from the tftp server and boot OpenWrt initramfs system. 7. Copy OpenWrt ubootmod-squashfs-sysupgrade.itb to the /tmp dir of the router using scp. 8. Run sysupgrade: ``` sysupgrade -n /tmp/squashfs-sysupgrade.itb ``` Recovery -------- 1. Place OpenWrt initramfs-recovery.itb image (with original name) on the tftp server (IP: 192.168.1.254). 2. Press "reset" button and power on the router. After ~10 sec release the button. 3. Use OpenWrt initramfs system for recovery. BL2 and FIP recovery -------------------- Use mtk_uartboot and UART connection if BL2 or FIP in UBI is destroyed: Link: https://github.com/981213/mtk_uartboot Return to stock: ---------------- 1. Copy partition backups (BL2.bin and FIP.bin) to the /tmp dir of the router using scp. 2. Install kmod-mtd-rw: ``` opkg update && opkg install kmod-mtd-rw ``` 3. Restore stock U-Boot and reboot: ``` insmod mtd-rw i_want_a_brick=1 mtd unlock BL2 mtd erase BL2 mtd write /tmp/BL2.bin BL2 mtd unlock FIP mtd erase FIP mtd write /tmp/FIP.bin FIP reboot ``` 4. Open U-Boot web recovery, upload stock firmware image and start upgrade. Link: http://192.168.1.1 Signed-off-by: Mikhail Zhilkin <[email protected]> Link: openwrt#16791 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit d413163) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
PSI provides a canonical way to see resource pressure increases as they develop, with pressure metrics for three major resources: memory, CPU, and IO. PSI stats are like barometers that provide fair warning of impending resource shortages, enabling users to take more proactive, granular, and nuanced steps when resources start becoming scarce. References: * https://www.kernel.org/doc/html/latest/accounting/psi.html * https://lwn.net/Articles/759781/ Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <[email protected]> Link: openwrt#13819 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit eed39d4) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Image build fails with PR openwrt#16861 merged while PR openwrt#16860 not merged. Removing kmod-leds-ktd202x from filogic.mk will fix the build process. Fixes: 2898d1d ("mediatek: add support for Acer Predator W6d and Acer Vero W6m") Signed-off-by: George Oldfort <[email protected]> Link: openwrt#17087 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit 1bdb6d8) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
Remove backtick from gdb description text, as that seems to be recognized as a shell action by compilation with apk, causing error. Example from test buildbot: rstrip.sh: /builder/shared-workdir/build/sdk/build_dir/target-aarch64_generic_musl/gdb-15.2/ipkg-aarch64_generic/gdb/usr/bin/gdb: executable bash: -c: line 1: unexpected EOF while looking for matching ``' bash: -c: line 2: syntax error: unexpected end of file make[3]: *** [Makefile:123: /builder/shared-workdir/build/sdk/bin/packages/aarch64_generic/base/gdb-15.2-r1.apk] Error 2 Local compilation: rstrip.sh: /OpenWrt/aarch64/build_dir/target-aarch64_cortex-a53_musl/gdb-15.2/ipkg-aarch64_cortex-a53/gdb/usr/bin/gdb: executable bash: -c: line 1: unexpected EOF while looking for matching ``' make[2]: *** [Makefile:123: /OpenWrt/aarch64/bin/packages/aarch64_cortex-a53/base/gdb-15.2-r1.apk] Error 2 Signed-off-by: Hannu Nyman <[email protected]> Link: openwrt#16908 Signed-off-by: Hauke Mehrtens <[email protected]> (cherry picked from commit adb921c) Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
This will hide the USE_APK setting in OpenWrt 24.10 by default. APK is not stable yet and we do not want to support it in OpenWrt 24.10 branch. References: https://openwrt.org/meetings/20241126#release_2410 Signed-off-by: Hauke Mehrtens <[email protected]> Signed-off-by: Petr Štetiar <[email protected]> [meeting notes ref, config] Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
During the last OpenWrt developer meeting 2024-11-26 it was decided, that 24.10 will be the last release using opkg package manager and thus apk won't be supported, so make it explicit and mark apk package manager as broken. References: https://openwrt.org/meetings/20241126#release_2410 Link: openwrt#17097 Signed-off-by: Petr Štetiar <[email protected]>
ynezz
force-pushed
the
ynezz/openwrt-24.10/sync-with-main
branch
from
6fa760a to
17bdccb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From https://lists.openwrt.org/pipermail/openwrt-devel/2024-November/043431.html
This pull request is my alternative to the proposed rebase, cherry-picking everything from main, but leaving any
apkrelated changes as they might introduce regressions withopkg. It was decided, thatipq60xxis not ready for prime time yet, so it will need to wait for the next release.Done in 9d2e5dc