From 3ebfd0078d6aa4848ee8f72640266bd0390f790a Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Thu, 22 Apr 2021 12:28:39 +0800 Subject: [PATCH 01/10] ccache: update to 4.2.1 Update ccache to 4.2.1 Signed-off-by: DENG Qingfang Signed-off-by: Hans Dedecker [refresh patch] --- tools/ccache/Makefile | 4 ++-- tools/ccache/patches/100-honour-copts.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index ff0204ae19..b4dc81aaaa 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=ccache -PKG_VERSION:=4.1 +PKG_VERSION:=4.2.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99 +PKG_HASH:=9d6ba1cdefdc690401f404b747d81a9a1802b17af4235815866b7620d980477e HOST_BUILD_PARALLEL:=1 diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index e4045ef9be..0dcc6598f5 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,6 +1,6 @@ --- a/src/ccache.cpp +++ b/src/ccache.cpp -@@ -1654,6 +1654,7 @@ calculate_result_name(Context& ctx, +@@ -1756,6 +1756,7 @@ calculate_result_name(Context& ctx, "CPLUS_INCLUDE_PATH", "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH", // clang From 95ac3f82c6914505b01b01ab819e02d091835598 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 23 Apr 2021 23:12:09 +0100 Subject: [PATCH 02/10] mediatek: mt7622: build AHCI driver as module Build the driver for the in-SoC AHCI SATA host as module, just like for the other subtargets. No board requires booting off SATA, so we don't need to have it built-in. All boards with SATA support already select kmod-ata-ahci-mtk which provides the module. Signed-off-by: Daniel Golle --- target/linux/mediatek/mt7622/config-5.10 | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/mediatek/mt7622/config-5.10 b/target/linux/mediatek/mt7622/config-5.10 index 0fa258e07a..1ab925190a 100644 --- a/target/linux/mediatek/mt7622/config-5.10 +++ b/target/linux/mediatek/mt7622/config-5.10 @@ -1,5 +1,4 @@ CONFIG_64BIT=y -CONFIG_AHCI_MTK=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MEDIATEK=y From de4b29dab987c5c1288558c3ca7e1edcd95920e0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 23 Apr 2021 23:05:54 +0100 Subject: [PATCH 03/10] image: introduce 'append-image-stage' build command Similar to 'append-image' this new command appends an existing binary. 'append-image-stage' also makes a copy of that binary and keeps it in $(STAGING_DIR_IMAGE). When called from within the ImageBuilder, this copy is used instead of expecting the binary to be present. This is useful for artifacts which include the initramfs/recovery image which is usually not included in the ImageBuilder. Signed-off-by: Daniel Golle --- include/image-commands.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/image-commands.mk b/include/image-commands.mk index 2c56ed8d1d..4c9075c35b 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -31,6 +31,18 @@ define Build/append-image dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@ endef +ifdef IB +define Build/append-image-stage + dd if=$(STAGING_DIR_IMAGE)/$(DEVICE_IMG_PREFIX)-$(1) >> $@ +endef +else +define Build/append-image-stage + dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) of=$(STAGING_DIR_IMAGE)/$(DEVICE_IMG_PREFIX)-$(1) + dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@ +endef +endif + + compat_version=$(if $(DEVICE_COMPAT_VERSION),$(DEVICE_COMPAT_VERSION),1.0) json_quote=$(subst ','\'',$(subst ",\",$(1))) #")') From 210916c9e6797e4e520970bafba12e49e98dc834 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 23 Apr 2021 23:10:08 +0100 Subject: [PATCH 04/10] mediatek: bpi-r64: fix sdcard.img.gz in ImageBuilder Generating the sdcard.img.gz file requires the initramfs/recovery image to be present. Use the newly introduced 'append-image-stage' build command to fix the ImageBuilder for the BPi-R64. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/mt7622.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index 58dc578d39..07a15edb9e 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -84,7 +84,7 @@ define Device/bananapi_bpi-r64 ARTIFACT/sdcard.img.gz := mt7622-gpt sdmmc |\ pad-to 512k | bl2 sdmmc-2ddr |\ pad-to 2048k | bl31-uboot bananapi_bpi-r64-sdmmc |\ - pad-to 6144k | append-image initramfs-recovery.itb |\ + pad-to 6144k | append-image-stage initramfs-recovery.itb |\ pad-to 38912k | mt7622-gpt emmc |\ pad-to 39424k | bl2 emmc-2ddr |\ pad-to 40960k | bl31-uboot bananapi_bpi-r64-emmc |\ From c7a5a093efd0725ef170c6dacd414044020233d9 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 24 Apr 2021 12:12:09 +0100 Subject: [PATCH 05/10] image: use portable filename in 'append-image-stage' The 'append-image-stage' command doesn't work when setting the EXTRA_IMAGE_NAME option of the ImageBuilder as in that case DEVICE_IMG_PREFIX is modified and no longer matches the value it had in buildroot. Choose a filename independent of DEVICE_IMG_PREFIX for images staged using 'append-image-stage' to fix that. Fixes: de4b29dab9 ("image: introduce 'append-image-stage' build command") Signed-off-by: Daniel Golle --- include/image-commands.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 4c9075c35b..9702d029d7 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -33,11 +33,11 @@ endef ifdef IB define Build/append-image-stage - dd if=$(STAGING_DIR_IMAGE)/$(DEVICE_IMG_PREFIX)-$(1) >> $@ + dd if=$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1) >> $@ endef else define Build/append-image-stage - dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) of=$(STAGING_DIR_IMAGE)/$(DEVICE_IMG_PREFIX)-$(1) + dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) of=$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1) dd if=$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1) >> $@ endef endif From cf20f1bb5f0479c2509dd651d08e235a3b9e8755 Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Mon, 12 Apr 2021 16:46:22 -0700 Subject: [PATCH 06/10] bpftools: fix feature override for masking clang Rename feature variable clang-bpf-global-var following upstream changes. This restores the HAVE_CLANG feature override and should avoid rare build errors where a recent host clang and BTF-enabled host kernel are present. Fixes: 23be333401f0 ("bpftools: update to 5.10.10") Signed-off-by: Tony Ambardar --- package/network/utils/bpftools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 9955d361f4..52963e4148 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -128,7 +128,7 @@ define Build/Configure | sort | uniq > FEATURE-DUMP.openwrt) $(SED) 's/feature-libbfd=1/feature-libbfd=$(HAVE_LIBBFD)/' \ -e 's/feature-libcap=1/feature-libcap=$(HAVE_LIBCAP)/' \ - -e 's/feature-clang-bpf-global-var=1/feature-clang-bpf-global-var=$(HAVE_CLANG)/' \ + -e 's/feature-clang-bpf-co-re=1/feature-clang-bpf-co-re=$(HAVE_CLANG)/' \ $(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt endef From aabc6320233f700f303e3e5d0adbba2cfe9ac2d9 Mon Sep 17 00:00:00 2001 From: Tony Ambardar Date: Sat, 10 Apr 2021 17:40:21 -0700 Subject: [PATCH 07/10] bpftools: update to v5.11.16, simplify make Update to the latest stable upstream version. Drop unneeded make variables to remove redundant assignments seen during invocation of package Makefile. Also remove the following patch now included upstream: * 200-fix-install-param-order-on-macos.patch Compile and run-tested on malta/mips32be, using bpftool directly and also libbpf (linked with tc) to inspect and load simple eBPF programs. Signed-off-by: Tony Ambardar --- package/network/utils/bpftools/Makefile | 12 +++++++----- .../200-fix-install-param-order-on-macos.patch | 11 ----------- 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 package/network/utils/bpftools/patches/200-fix-install-param-order-on-macos.patch diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 52963e4148..f044cc81f8 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bpftools -PKG_VERSION:=5.11.2 -PKG_RELEASE:=2 +PKG_VERSION:=5.11.16 +PKG_RELEASE:=1 PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x -PKG_HASH:=904a5b3cbaf5264ef8da6c7a5445fa7ea19168ad77fb83a7cc1b8ba95d52d0a0 +PKG_HASH:=21163681d130cbce5a6be39019e2c69e44f284855ddd70b1a3bd039249540f43 PKG_MAINTAINER:=Tony Ambardar @@ -93,9 +93,11 @@ ifneq ($(BUILD_VARIANT),lib) TARGET_LDFLAGS += -Wl,--gc-sections endif -MAKE_FLAGS += \ +MAKE_VARS = \ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" + +MAKE_FLAGS += \ BPFTOOL_VERSION="$(LINUX_VERSION)" \ FEATURES_DUMP="$(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt" \ OUTPUT="$(PKG_BUILD_DIR)/" \ diff --git a/package/network/utils/bpftools/patches/200-fix-install-param-order-on-macos.patch b/package/network/utils/bpftools/patches/200-fix-install-param-order-on-macos.patch deleted file mode 100644 index ffb7e2ce52..0000000000 --- a/package/network/utils/bpftools/patches/200-fix-install-param-order-on-macos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/lib/bpf/Makefile -+++ b/tools/lib/bpf/Makefile -@@ -236,7 +236,7 @@ define do_install - if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ - fi; \ -- $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2' -+ $(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2' - endef - - install_lib: all_cmd From c61ab68387f61d3e90569a1779f29ce49dde55c6 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sat, 24 Apr 2021 21:03:02 +0200 Subject: [PATCH 08/10] nat46: update to git HEAD 9df230a Zero checksum handling (#25) 7688102 skip generating a UDP4 csum if the UDP6 csum is 0 and zero_csum_pass is set 4a9e4b1 zero csum: avoid calling the checksum adjustment function if udp csum is zero 2de14c5 add a module argument to skip checksum adjust for UDP if checksum is zero Signed-off-by: Hans Dedecker --- package/kernel/nat46/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index c2bf582cfa..29e03a04d5 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -3,11 +3,11 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=nat46 -PKG_MIRROR_HASH:=5cc35d11ad6937734f830be5e260eb17a7b0561e37f538e5fc99026d0f2ea517 +PKG_MIRROR_HASH:=aef3dae41e896c69b29d7fa3639c69f5a88db605a72dcd1133635980656a558c PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git -PKG_SOURCE_DATE:=2020-08-17 +PKG_SOURCE_DATE:=2021-04-15 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=362640b41ae52b732d9e9729e61ac555492442a3 +PKG_SOURCE_VERSION:=9df230a143477e8bc86968114439ee748ac9fd21 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 From e8a5670122e04574fdb5855ecd63d18f317c5bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Henriques?= Date: Sun, 18 Apr 2021 23:41:30 +0100 Subject: [PATCH 09/10] dnsmasq: add ignore hosts dir to dnsmasq init script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running multiple instances of dnsmasq, for example one being for the lan and another for a guest network, it might not be desirable to have the same dns names configured in both networks Signed-off-by: João Henriques --- package/network/services/dnsmasq/files/dnsmasq.init | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 680e72f9e7..44e7d2d4f9 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1012,7 +1012,12 @@ dnsmasq_start() xappend "--dhcp-broadcast=tag:needs-broadcast" - xappend "--addn-hosts=$(dirname $HOSTFILE)" + config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0 + if [ "$ignore_hosts_dir" = "1" ]; then + xappend "--addn-hosts=$HOSTFILE" + else + xappend "--addn-hosts=$(dirname $HOSTFILE)" + fi config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d" xappend "--conf-dir=$dnsmasqconfdir" From f4473baf6e24060ef111f97a71419ab5f813e5ca Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 24 Apr 2021 15:54:24 +0300 Subject: [PATCH 10/10] ath79: add missing kernel config symbol Commit f724a583dcf7 updated the nand-rb4xx driver to the 5.10 testing kernel, but forgot to add the new kernel config symbol it introduces to the 5.10 config. Fixes: f724a583dcf7 ("ath79: mikrotik: update nand-rb4xx driver") Reported-by: Russell Senior Signed-off-by: Stijn Tintel --- target/linux/ath79/config-5.10 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ath79/config-5.10 b/target/linux/ath79/config-5.10 index 9aa320dcda..d4abddb445 100644 --- a/target/linux/ath79/config-5.10 +++ b/target/linux/ath79/config-5.10 @@ -96,6 +96,7 @@ CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y CONFIG_MDIO_GPIO=y CONFIG_MEMFD_CREATE=y +# CONFIG_MFD_RB4XX_CPLD is not set CONFIG_MFD_SYSCON=y CONFIG_MIGRATION=y CONFIG_MIPS=y