lede/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch

--- a/configure
+++ b/configure
@@ -412,7 +412,7 @@ check_tirpc()
 
 check_mnl()
 {
-	if ${PKG_CONFIG} libmnl --exists; then
+	if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists; then
 		echo "HAVE_MNL:=y" >>$CONFIG
 		echo "yes"
update to R7.5.4 2018-01-15 18:26:41 +08:00			`--- a/configure`
			`+++ b/configure`
treewide: sync with upstream (#10658) * rules: fix broken commitcount on alpine system 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: #11200 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> * image-commands.mk: Be consistent in command invocation 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> * image: fix device profile specific COMPILE targets Commit a01d23e75 ("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: a01d23e75 ("image: always rebuild kernel loaders") Fixes: a7fb589e8 ("image: always rebuild kernel loaders") Signed-off-by: Michael Pratt <mcpratt@pm.me> * trusted-firmware-a.mk: use correct CPE ID 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: 104d60fe94ce ("trusted-firmware-a.mk: add PKG_CPE_ID") Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * fritz-tools: fritz_tffs_nand: exclude oob code when disabled 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 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 This speeds up the tool significantly, especially when using the "-a" argument. Signed-off-by: Andre Heider <a.heider@gmail.com> * iproute2: add missing libbpf dependency 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 #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: #9491 Signed-off-by: Kien Truong <duckientruong@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * iproute2: update to 6.0.0 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> * iproute2: update to 6.1.0 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 Update to latest version. Signed-off-by: Nick Hainke <vincent@systemli.org> * Revert "Revert "tools/upx: remove (#10622)"" This reverts commit d3e16f203a8d238ebcf8d40e7453e8b375248e08. * kernel: Make use of KERNEL_MAKE 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> * toolchain: gcc: backport patches to fix build with glibc 2.36 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> * toolchain: glibc: Update to glibc 2.36 This updates to glibc to version 2.36. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tools/llvm: update to 15.0.6 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> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> Signed-off-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Kien Truong <duckientruong@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Co-authored-by: Christian Marangi <ansuelsmth@gmail.com> Co-authored-by: Olliver Schinagl <oliver@schinagl.nl> Co-authored-by: Michael Pratt <mcpratt@pm.me> Co-authored-by: Stijn Tintel <stijn@linux-ipv6.be> Co-authored-by: Andre Heider <a.heider@gmail.com> Co-authored-by: Kien Truong <duckientruong@gmail.com> Co-authored-by: Nick Hainke <vincent@systemli.org> Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> 2022-12-23 02:09:34 +08:00			`@@ -412,7 +412,7 @@ check_tirpc()`
update to R7.5.4 2018-01-15 18:26:41 +08:00
			`check_mnl()`
			`{`
iproute2: add cake fwmark support 2019-03-20 14:30:49 +08:00			`- if ${PKG_CONFIG} libmnl --exists; then`
			`+ if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists; then`
update to R7.5.4 2018-01-15 18:26:41 +08:00			`echo "HAVE_MNL:=y" >>$CONFIG`
			`echo "yes"`
iproute2: add cake fwmark support 2019-03-20 14:30:49 +08:00