diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index e71746f651..f2864d6a10 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -149,12 +149,17 @@ define Kernel/CopyImage } endef +# Always add "modules" so a proper Module.symvers file is written that +# also contains symbols from the kernel modules. Without these symbols +# external packages that depend on exported symbols from kernel modules +# will fail to build. define Kernel/CompileImage/Default rm -f $(TARGET_DIR)/init - +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) + +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) modules $(call Kernel/CopyImage) endef +# Here as well, always add "modules", see comment above. ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) define Kernel/CompileImage/Initramfs $(call Kernel/Configure/Initramfs) @@ -175,7 +180,7 @@ endif # ? $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),$(STAGING_DIR_HOST)/bin/zstd -T0 -f -o $(KERNEL_BUILD_DIR)/initrd.cpio.zstd $(KERNEL_BUILD_DIR)/initrd.cpio) endif - +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) + +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) modules $(call Kernel/CopyImage,-initramfs) endef else diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index aba1970d35..2f6b779e6d 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2021-05-20 -PKG_SOURCE_VERSION:=42c19303bff5853866292671df30e9cae0fd60d1 -PKG_MIRROR_HASH:=534cd7e700589b0ab042a74368e48ea907234caa795a66944694463f23d69af3 +PKG_SOURCE_DATE:=2021-05-26 +PKG_SOURCE_VERSION:=899c2a4520526d43113f73cf673f20e2486a40fb +PKG_MIRROR_HASH:=354905192b30af88ea953241ed332555e67cdb7e3b54dd139250bf1e6ad3a709 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index fb7d8667c6..99234978a1 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -1,19 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0-or-later # -# Copyright (C) 2006-2015 OpenWrt.org -# Copyright (C) 2016-2017 LEDE Project +# Copyright (C) 2006-2021 OpenWrt.org # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git +PKG_SOURCE_URL:=$(PROJECT_GIT)/project/opkg-lede.git PKG_SOURCE_DATE:=2021-03-15 PKG_SOURCE_VERSION:=5936c4f9660248284e8a9b040ea3153d3ea888de PKG_MIRROR_HASH:=b873c209baaf4f150c89646d58e4a0072f807d24b02c320ab8c7ae9180c13240 diff --git a/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch b/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch new file mode 100644 index 0000000000..ac9afa34ef --- /dev/null +++ b/package/utils/busybox/patches/540-nslookup-mention-QUERY_TYPE-SRV.patch @@ -0,0 +1,30 @@ +From a0136f24f788e8bfc4ab74a647b27e115a25d9fb Mon Sep 17 00:00:00 2001 +From: Paul Spooren +Date: Wed, 19 May 2021 00:55:21 +0200 +Subject: [PATCH] nslookup: mention QUERY_TYPE SRV + +SRV lookups are supported since "6b4960155 nslookup: implement support +for SRV records" and should therefore be mentioned as a possible +QUERY_TYPE in the help message. + +Signed-off-by: Paul Spooren +--- + networking/nslookup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/networking/nslookup.c b/networking/nslookup.c +index dda22de0e..2ae8d391c 100644 +--- a/networking/nslookup.c ++++ b/networking/nslookup.c +@@ -25,7 +25,7 @@ + //usage:#define nslookup_full_usage "\n\n" + //usage: "Query DNS about HOST" + //usage: IF_FEATURE_NSLOOKUP_BIG("\n") +-//usage: IF_FEATURE_NSLOOKUP_BIG("\nQUERY_TYPE: soa,ns,a,"IF_FEATURE_IPV6("aaaa,")"cname,mx,txt,ptr,any") ++//usage: IF_FEATURE_NSLOOKUP_BIG("\nQUERY_TYPE: soa,ns,a,"IF_FEATURE_IPV6("aaaa,")"cname,mx,txt,ptr,srv,any") + //usage:#define nslookup_example_usage + //usage: "$ nslookup localhost\n" + //usage: "Server: default\n" +-- +2.30.2 + diff --git a/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch new file mode 100644 index 0000000000..ab6b250953 --- /dev/null +++ b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch @@ -0,0 +1,24 @@ +From: Felix Fietkau +Date: Tue, 25 May 2021 18:00:34 +0200 +Subject: [PATCH] perf jevents: fix getting maximum number of fds + +On some hosts, rlim.rlim_max can be returned as RLIM_INFINITY. +By casting it to int, it is interpreted as -1, which will cause get_maxfds +to return 0, causing "Invalid argument" errors in nftw() calls. +Fix this by casting the second argument of min() to rlim_t instead. + +Fixes: 80eeb67fe577 ("perf jevents: Program to convert JSON file") +Signed-off-by: Felix Fietkau +--- + +--- a/tools/perf/pmu-events/jevents.c ++++ b/tools/perf/pmu-events/jevents.c +@@ -897,7 +897,7 @@ static int get_maxfds(void) + struct rlimit rlim; + + if (getrlimit(RLIMIT_NOFILE, &rlim) == 0) +- return min((int)rlim.rlim_max / 2, 512); ++ return min(rlim.rlim_max / 2, (rlim_t)512); + + return 512; + }