treewide: sync with upstream #10658

misaka36 · 2022-12-21T07:32:55Z

Q：你知道这是pull request吗？(使用 "x" 选择)

我知道

Remove tools/upx again to save a bit of compilation time. (see coolsnowwolf/packages#626)

To generate commitcount we use grep --max-count. This is not present on alpine grep and cause wrong generation. Use -m as it's just the short version of --max-count and more portable. Fixes: coolsnowwolf#11200 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Most/all other tools use the staging dir prefix, gzip should as well. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Christian Marangi <ansuelsmth@gmail.com>

Commit a01d23e ("image: always rebuild kernel loaders") is a step in the right direction, but exposed some issues and regressions in the makefile. Some of the files made by device specific COMPILE targets start with an "append" command (i.e. >> instead of > redirection) and if the file already exists, the target file is the input to itself before the first recipe-specified input. Fixes: a01d23e ("image: always rebuild kernel loaders") Fixes: a7fb589 ("image: always rebuild kernel loaders") Signed-off-by: Michael Pratt <mcpratt@pm.me>

There are 2 different CPE IDs on the NVD website: cpe:/a:arm:trusted_firmware-a cpe:/o:arm:arm_trusted_firmware The ID as currently used in trusted-firmware-a.mk does not exist. The CPE ID using the arm_trusted_firmware product name only lists a few records for versions 2.2 and 2.3 on the NVD site. The CPE ID using the trusted_firmware-a product name lists many more records, and actually has a CVE linked to it. Therefore, use the CPE ID using the trusted_firmware-a product name. Fixes: 104d60f ("trusted-firmware-a.mk: add PKG_CPE_ID") Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

Skip unnecessary stuff if checking the oob data is disabled. Signed-off-by: Andre Heider <a.heider@gmail.com>

This doesn't help and "[0]" gets in the way of bounds checks. Signed-off-by: Andre Heider <a.heider@gmail.com>

This speeds up the tool significantly, especially when using the "-a" argument. Signed-off-by: Andre Heider <a.heider@gmail.com>

This patch adds libbpf to the dependencies of tc-mod-iptables. The package tc-mod-iptables is missing libbpf as a dependency, which leads to the build failure described in bug coolsnowwolf#9491 LIBBPF_FORCE=on set, but couldn't find a usable libbpf The build dependency is already automatically added because some other packages from iproute2 depend on libbpf, but bpftools has multiple build variants. With multiple build variants none gets build by default and the build system will not build bpftools before iproute2. Fixes: coolsnowwolf#9491 Signed-off-by: Kien Truong <duckientruong@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Release Notes: https://lore.kernel.org/netdev/20221004082610.56b04719@hermes.local/t/ Remove upstreamed patch: - 010-ipstats-Add-param.h-for-musl.patch Refreshed: - 140-keep_libmnl_optional.patch - 145-keep_libelf_optional.patch - 150-keep_libcap_optional.patch - 155-keep_tirpc_optional.patch - 170-ip_tiny.patch - 190-fix-nls-rpath-link.patch - 200-drop_libbsd_dependency.patch - 300-selinux-configurable.patch Signed-off-by: Nick Hainke <vincent@systemli.org>

Announcement: https://lore.kernel.org/netdev/20221214094130.7b11ec2e@hermes.local/T/#t Refresh patch: - 170-ip_tiny.patch Signed-off-by: Nick Hainke <vincent@systemli.org>

Update to latest version. Signed-off-by: Nick Hainke <vincent@systemli.org>

This reverts commit d3e16f2.

Make use of KERNEL_MAKE in kernel packages were easily possible. This moves some more code to common places and reduces the number of lines. It is defined like this: KERNEL_MAKE = $(MAKE) $(KERNEL_MAKEOPTS) KERNEL_MAKEOPTS = -C $(LINUX_DIR) $(KERNEL_MAKE_FLAGS) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

glibc 2.36 changed the definition of enum fsconfig_command, it now collides with the same definition from sys/mount.h. Remove the include of linux/fs.h This still compiled with musl too. This backports a patch which is already in the stable branch of GCC 11 and GCC 12. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

This updates to glibc to version 2.36. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Release Notes: https://discourse.llvm.org/t/llvm-15-0-0-release/65099 https://discourse.llvm.org/t/llvm-15-0-1-released/65380 https://discourse.llvm.org/t/llvm-15-0-2-released/65695 https://discourse.llvm.org/t/llvm-15-0-3-released/66036 https://discourse.llvm.org/t/llvm-15-0-4-released/66337 https://discourse.llvm.org/t/llvm-15-0-5-release/66616 https://discourse.llvm.org/t/llvm-15-0-6-released/66899 Remove HOST_BUILD_PARALLEL as it's default now. Signed-off-by: Linhui Liu <liulinhui36@gmail.com>

* https://github.com/coolsnowwolf/lede: fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options kernel: Reorder kernel configuration options generic: fix wrong PTR_ERR use in of net mac address ascii patch mediatek: filogic: enable maxlinear PHY support mediatek: remove obsolete patch kernel: bump to 5.10.161, 5.15.85, 6.1.1 (coolsnowwolf#10666)

* https://github.com/coolsnowwolf/lede: fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K

* https://github.com/coolsnowwolf/lede: fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options kernel: Reorder kernel configuration options generic: fix wrong PTR_ERR use in of net mac address ascii patch mediatek: filogic: enable maxlinear PHY support mediatek: remove obsolete patch

* https://github.com/coolsnowwolf/lede: (45 commits) automount: add kmod-fs-ntfs3 (coolsnowwolf#10671) n2n: move to `packages` feeds (coolsnowwolf#10611) fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options kernel: Reorder kernel configuration options generic: fix wrong PTR_ERR use in of net mac address ascii patch mediatek: filogic: enable maxlinear PHY support mediatek: remove obsolete patch kernel: bump to 5.10.161, 5.15.85, 6.1.1 (coolsnowwolf#10666) rockchip: force enable rk3568 msi interrupt rockchip: update rk3568 pcie2x1 dts part kernel: package mhi pci driver linux-firmware: package ath11k consumer cards firmware linux-firmware: update to 20221109 Revert "tools/upx: remove (coolsnowwolf#10622)" Kernel: bump to 5.4.228, 5.10.160, 5.15.84 (coolsnowwolf#10656) ...

* https://github.com/coolsnowwolf/lede: (39 commits) automount: add kmod-fs-ntfs3 (coolsnowwolf#10671) n2n: move to `packages` feeds (coolsnowwolf#10611) fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options kernel: Reorder kernel configuration options generic: fix wrong PTR_ERR use in of net mac address ascii patch mediatek: filogic: enable maxlinear PHY support mediatek: remove obsolete patch kernel: bump to 5.10.161, 5.15.85, 6.1.1 (coolsnowwolf#10666) rockchip: force enable rk3568 msi interrupt rockchip: update rk3568 pcie2x1 dts part kernel: package mhi pci driver linux-firmware: package ath11k consumer cards firmware linux-firmware: update to 20221109 Revert "tools/upx: remove (coolsnowwolf#10622)" Kernel: bump to 5.4.228, 5.10.160, 5.15.84 (coolsnowwolf#10656) ...

* 'master' of https://github.com/coolsnowwolf/lede: (104 commits) mt76: update to the latest version dnsmasq: bump to v2.88 (coolsnowwolf#10683) Revert "mediatek: add support for Netgear WAX206" ramips: Fix drivers/pwm/pwm-mediatek-ramips.c compile kernel: Move CONFIG_PWM_IMG and CONFIG_PWM_MEDIATEK to generic configuration kernel: Move CONFIG_DRM_XEN_FRONTEND to generic configuration automount: add kmod-fs-ntfs3 (coolsnowwolf#10671) n2n: move to `packages` feeds (coolsnowwolf#10611) fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options kernel: Reorder kernel configuration options generic: fix wrong PTR_ERR use in of net mac address ascii patch mediatek: filogic: enable maxlinear PHY support mediatek: remove obsolete patch kernel: bump to 5.10.161, 5.15.85, 6.1.1 (coolsnowwolf#10666) rockchip: force enable rk3568 msi interrupt ...

* https://github.com/coolsnowwolf/lede: (25 commits) bcm27xx: fix BCMGENET kernel config linux-firmware: ath11k: add symlink for WCN6855 hw2.1 linux-firmware: update to 20221214 ath10k-ct: add linux kernel v6.1 api update uhttpd: update to latest Git HEAD (coolsnowwolf#10685) mt76: refresh patches (coolsnowwolf#10689) mt76: update to the latest version dnsmasq: bump to v2.88 (coolsnowwolf#10683) Revert "mediatek: add support for Netgear WAX206" ramips: Fix drivers/pwm/pwm-mediatek-ramips.c compile kernel: Move CONFIG_PWM_IMG and CONFIG_PWM_MEDIATEK to generic configuration kernel: Move CONFIG_DRM_XEN_FRONTEND to generic configuration automount: add kmod-fs-ntfs3 (coolsnowwolf#10671) n2n: move to `packages` feeds (coolsnowwolf#10611) fstools: fix ntfs3 mount with utf-8 treewide: sync with upstream (coolsnowwolf#10658) rockchip: add wireless support for H68K mediatek: add support for Netgear WAX206 uboot-sunxi: use UUID of bootdev and bootpart kernel: Add missing kernel configuration options ...

Ansuel and others added 15 commits December 21, 2022 19:40

image-commands.mk: Be consistent in command invocation

eb4c681

Most/all other tools use the staging dir prefix, gzip should as well. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Christian Marangi <ansuelsmth@gmail.com>

fritz-tools: fritz_tffs_nand: exclude oob code when disabled

f2de3df

Skip unnecessary stuff if checking the oob data is disabled. Signed-off-by: Andre Heider <a.heider@gmail.com>

fritz-tools: fritz_tffs_nand: get rid of struct tffs_sectors

242b833

This doesn't help and "[0]" gets in the way of bounds checks. Signed-off-by: Andre Heider <a.heider@gmail.com>

fritz-tools: fritz_tffs_nand: cache already read sector ids

44e0dbc

This speeds up the tool significantly, especially when using the "-a" argument. Signed-off-by: Andre Heider <a.heider@gmail.com>

iproute2: update to 6.1.0

ecc4975

Announcement: https://lore.kernel.org/netdev/20221214094130.7b11ec2e@hermes.local/T/#t Refresh patch: - 170-ip_tiny.patch Signed-off-by: Nick Hainke <vincent@systemli.org>

tools/xz: update to 5.2.10

226cb69

Update to latest version. Signed-off-by: Nick Hainke <vincent@systemli.org>

Revert "Revert "tools/upx: remove (coolsnowwolf#10622)""

355749b

This reverts commit d3e16f2.

toolchain: glibc: Update to glibc 2.36

7814692

This updates to glibc to version 2.36. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

misaka36 force-pushed the sync branch from bbcaa51 to 7814692 Compare December 21, 2022 11:41

coolsnowwolf merged commit d2460df into coolsnowwolf:master Dec 22, 2022

misaka36 deleted the sync branch December 23, 2022 00:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

treewide: sync with upstream #10658

treewide: sync with upstream #10658

misaka36 commented Dec 21, 2022 •

edited

Loading

treewide: sync with upstream #10658

treewide: sync with upstream #10658

Conversation

misaka36 commented Dec 21, 2022 • edited Loading

misaka36 commented Dec 21, 2022 •

edited

Loading