Merge remote-tracking branch 'upstream/master'

kooiot · Sep 13, 2024 · e9604f0 · e9604f0
2 parents 0acd3e1 + c4a9265
commit e9604f0
Show file tree

Hide file tree

Showing 411 changed files with 6,340 additions and 56,516 deletions.
diff --git a/include/bpf.mk b/include/bpf.mk
@@ -66,7 +66,7 @@ BPF_CFLAGS := \
 
 ifneq ($(CONFIG_HAS_BPF_TOOLCHAIN),)
 ifeq ($(DUMP)$(filter download refresh,$(MAKECMDGOALS)),)
-  CLANG_VER:=$(shell $(CLANG) -dM -E - < /dev/null | grep __clang_major__ | cut -d' ' -f3)
+  CLANG_VER:=$(shell $(CLANG) --target=$(BPF_TARGET) -dM -E - < /dev/null | grep __clang_major__ | cut -d' ' -f3)
   CLANG_VER_VALID:=$(shell [ "$(CLANG_VER)" -ge "$(CLANG_MIN_VER)" ] && echo 1 )
   ifeq ($(CLANG_VER_VALID),)
     $(error ERROR: LLVM/clang version too old. Minimum required: $(CLANG_MIN_VER), found: $(CLANG_VER))

diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Tobias Maedel <[email protected]>
+# Copyright (C) 2020 Sarah Maedel <[email protected]>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +12,7 @@ PKG_RELEASE:=1
 
 PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201
 
-PKG_MAINTAINER:=Tobias Maedel <[email protected]>
+PKG_MAINTAINER:=Sarah Maedel <[email protected]>
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/trusted-firmware-a.mk

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -104,6 +104,9 @@ openembed,som7981)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x80000"
 	ubootenv_add_uci_sys_config "/dev/mtd3" "0x0" "0x100000" "0x100000"
 	;;
+openwrt,one)
+	ubootenv_add_ubi_default
+	;;
 smartrg,sdg-8733|\
 smartrg,sdg-8734)
 	local envdev=$(find_mmc_part "u-boot-env" "mmcblk0")

diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
@@ -149,7 +149,7 @@
 +
 +			partition@200000 {
 +				label = "ubi";
-+				reg = <0x100000 0x7f00000>;
++				reg = <0x100000 0xff00000>;
 +			};
 +		};
 +	};

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -9,7 +9,7 @@ PKG_VERSION:=2024.07
 PKG_RELEASE:=1
 PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
 
-PKG_MAINTAINER:=Tobias Maedel <[email protected]>
+PKG_MAINTAINER:=Sarah Maedel <[email protected]>
 
 UBOOT_USE_BINMAN:=1
 UBOOT_USE_INTREE_DTC:=1

diff --git 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:=2024-09-05
-PKG_SOURCE_VERSION:=61c606d6e66b132f602135e0f0fda5f532b588e9
-PKG_MIRROR_HASH:=9fc091803545b0314c888e74ea7cecb5c4f8dbdb9b832bb5595378e67fd06ea3
+PKG_SOURCE_DATE:=2024-09-12
+PKG_SOURCE_VERSION:=02aa43d82d587d87523231be5a5e0bf956435725
+PKG_MIRROR_HASH:=a0e997ed9b0191417e65aaf43fbfd3a51b734ce1ea83f87e2d71b904b5a368ca
 PKG_MAINTAINER:=Felix Fietkau <[email protected]>
 
 PKG_LICENSE:=GPL-2.0

diff --git a/package/utils/ct-bugcheck/Makefile b/package/utils/ct-bugcheck/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ct-bugcheck
-PKG_RELEASE:=2016-07-21
+PKG_RELEASE:=2016.07.21
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ucode
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/jow-/ucode.git
@@ -25,16 +25,17 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
+CMAKE_OPTIONS += \
+	-DSOVERSION=$(PKG_ABI_VERSION)
+	-DCMAKE_SKIP_RPATH=FALSE \
+	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
 
 ifeq ($(HOST_OS),Darwin)
   CMAKE_HOST_OPTIONS += \
-	-DCMAKE_SKIP_RPATH=FALSE \
-	-DCMAKE_MACOSX_RPATH=1 \
-	-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
+	-DCMAKE_MACOSX_RPATH=1
 else
   CMAKE_HOST_OPTIONS += \
-	-DSOVERSION=$(PKG_ABI_VERSION)
+	-DUSE_RPATH="${STAGING_DIR_HOSTPKG}/lib"
 endif
 
 CMAKE_HOST_OPTIONS += \

diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
@@ -11,8 +11,7 @@ FEATURES:=squashfs nand usb pci pcie gpio pwm
 CPU_TYPE:=cortex-a9
 SUBTARGETS:=generic
 
-KERNEL_PATCHVER:=6.1
-KERNEL_TESTING_PATCHVER:=6.6
+KERNEL_PATCHVER:=6.6
 
 define Target/Description
 	Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.