Merge branch 'master' of https://github.com/coolsnowwolf/lede

* 'master' of https://github.com/coolsnowwolf/lede: mt76: add stand-alone MT7622 firmware package mt76: add stand-alone MT7915 firmware package mt76: remove unnecessary dependency from mt7915e iwinfo: backport IPQ8074 and QCNxxxx devices support (coolsnowwolf#10743) kernel: bump 6.1 to 6.1.4 kernel: fix ethernet regression on mt7986 kernel: mediatek: fix WED offload regression on MT7622 kernel: mediatek: improve ethernet fix for dealing with small fragments generic: 5.10: backport Treat IPv4 segment's lowest address as unicast ddns-scripts_aliyun: update script (coolsnowwolf#10738) kernel: bump 6.1 to 6.1.3 treewide: sync with upstream (coolsnowwolf#10720)
doorxp · Jan 10, 2023 · d3ad7c5 · d3ad7c5
2 parents 5cbb7c3 + 1823afb
commit d3ad7c5
Show file tree

Hide file tree

Showing 39 changed files with 1,602 additions and 139 deletions.
diff --git a/include/kernel-6.1 b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .2
-LINUX_KERNEL_HASH-6.1.2 = ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae
+LINUX_VERSION-6.1 = .4
+LINUX_KERNEL_HASH-6.1.4 = 8aa8f64fa60bb13381a9608d1fefbdd0555e2a70c40b2c7d0671b0d64aa4559e
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006-2020 OpenWrt.org
 
-PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread
+PKG_DEFAULT_DEPENDS = +libc
 
 ifneq ($(PKG_NAME),toolchain)
   PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2)))

diff --git a/include/target.mk b/include/target.mk
@@ -233,6 +233,7 @@ ifeq ($(DUMP),1)
   ifeq ($(ARCH),powerpc)
     CPU_CFLAGS_603e:=-mcpu=603e
     CPU_CFLAGS_8540:=-mcpu=8540
+    CPU_CFLAGS_8548:=-mcpu=8548
     CPU_CFLAGS_405:=-mcpu=405
     CPU_CFLAGS_440:=-mcpu=440
     CPU_CFLAGS_464fp:=-mcpu=464fp

diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
@@ -171,7 +171,7 @@ endef
 define KernelPackage/mt7615-firmware
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7615e firmware
-  DEFAULT:=PACKAGE_kmod-mt7615e
+  DEPENDS+=+kmod-mt7615e
 endef
 
 define KernelPackage/mt7615e
@@ -182,6 +182,12 @@ define KernelPackage/mt7615e
   AUTOLOAD:=$(call AutoProbe,mt7615e)
 endef
 
+define KernelPackage/mt7622-firmware
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7622 firmware
+  DEPENDS+=+kmod-mt7615e
+endef
+
 define KernelPackage/mt7663-firmware-ap
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7663e firmware (optimized for AP)
@@ -218,10 +224,16 @@ define KernelPackage/mt7663u
   AUTOLOAD:=$(call AutoProbe,mt7663u)
 endef
 
+define KernelPackage/mt7915-firmware
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7915 firmware
+  DEPENDS+=+kmod-mt7915e
+endef
+
 define KernelPackage/mt7915e
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7915e wireless driver
-  DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
   FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
   AUTOLOAD:=$(call AutoProbe,mt7915e)
 endef
@@ -445,9 +457,14 @@ define KernelPackage/mt7615-firmware/install
 		$(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7615_n9.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7615_rom_patch.bin \
-		$(if $(CONFIG_TARGET_mediatek_mt7622), \
-			$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \
-			$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin) \
+		$(1)/lib/firmware/mediatek
+endef
+
+define KernelPackage/mt7622-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
+	cp \
+		$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin \
 		$(1)/lib/firmware/mediatek
 endef
 
@@ -467,7 +484,7 @@ define KernelPackage/mt7663-firmware-sta/install
 		$(1)/lib/firmware/mediatek
 endef
 
-define KernelPackage/mt7915e/install
+define KernelPackage/mt7915-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
@@ -534,12 +551,14 @@ $(eval $(call KernelPackage,mt76-connac))
 $(eval $(call KernelPackage,mt76-sdio))
 $(eval $(call KernelPackage,mt7615-common))
 $(eval $(call KernelPackage,mt7615-firmware))
+$(eval $(call KernelPackage,mt7622-firmware))
 $(eval $(call KernelPackage,mt7615e))
 $(eval $(call KernelPackage,mt7663-firmware-ap))
 $(eval $(call KernelPackage,mt7663-firmware-sta))
 $(eval $(call KernelPackage,mt7663-usb-sdio))
 $(eval $(call KernelPackage,mt7663u))
 $(eval $(call KernelPackage,mt7663s))
+$(eval $(call KernelPackage,mt7915-firmware))
 $(eval $(call KernelPackage,mt7915e))
 $(eval $(call KernelPackage,mt7916-firmware))
 $(eval $(call KernelPackage,mt7986-firmware))

diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh
@@ -199,7 +199,7 @@ enable_domain() {
 # 获取子域名解析记录列表
 describe_domain() {
 	local count value; local ret=0
-	aliyun_transfer "Action=DescribeSubDomainRecords" "SubDomain=${__HOST}.${__DOMAIN}" || write_log 14 "服务器通信失败"
+	aliyun_transfer "Action=DescribeSubDomainRecords" "SubDomain=${__HOST}.${__DOMAIN}"  "DomainName=${__DOMAIN}" || write_log 14 "服务器通信失败"
 	write_log 7 "获取到解析记录: $(cat "$DATFILE" 2> /dev/null)" 
 	json_cleanup; json_load "$(cat "$DATFILE" 2> /dev/null)" >/dev/null 2>&1
 	json_get_var count "TotalCount"

diff --git a/package/network/services/bridger/Makefile b/package/network/services/bridger/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bridger
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/nbd168/bridger
-PKG_SOURCE_DATE:=2022-04-06
-PKG_SOURCE_VERSION:=e8f6814a85b4ea951657e7018c5d77597400f44a
-PKG_MIRROR_HASH:=f917e099a9ab2a55745a7254239efabe695a722d5c448342198cdc847a4a24ac
+PKG_SOURCE_DATE:=2023-01-03
+PKG_SOURCE_VERSION:=978c1f9eed07504cc0b84f72ee7384aab722386a
+PKG_MIRROR_HASH:=2a019b188d8de2fdc95453529d1820b0a7a5576adf161bd19e182c9c1c2b2c85
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
@@ -128,11 +128,6 @@ ifneq ($(LOCAL_TYPE),hostapd)
   endif
 endif
 
-ifdef CONFIG_USE_GLIBC
-  TARGET_LDFLAGS += -lrt
-  TARGET_LDFLAGS_C += -lrt
-endif
-
 DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
 
 

diff --git a/package/network/utils/iwinfo/patches/001-ralink.patch b/package/network/utils/iwinfo/patches/001-ralink.patch
@@ -223,7 +223,7 @@
  #endif
 --- a/include/iwinfo.h
 +++ b/include/iwinfo.h
-@@ -259,6 +259,7 @@ extern const struct iwinfo_ops wext_ops;
+@@ -306,6 +306,7 @@ extern const struct iwinfo_ops wext_ops;
  extern const struct iwinfo_ops madwifi_ops;
  extern const struct iwinfo_ops nl80211_ops;
  extern const struct iwinfo_ops wl_ops;
@@ -233,7 +233,7 @@
 
 --- a/iwinfo_lib.c
 +++ b/iwinfo_lib.c
-@@ -334,6 +334,9 @@ static const struct iwinfo_ops *backends
+@@ -339,6 +339,9 @@ static const struct iwinfo_ops *backends
  #ifdef USE_WL
  	&wl_ops,
  #endif
@@ -245,7 +245,7 @@
 
 --- a/iwinfo_lua.c
 +++ b/iwinfo_lua.c
-@@ -659,6 +659,35 @@ static int iwinfo_L_countrylist(lua_Stat
+@@ -678,6 +678,35 @@ static int iwinfo_L_countrylist(lua_Stat
  	return 1;
  }
 
@@ -281,7 +281,7 @@
 
  #ifdef USE_WL
  /* Broadcom */
-@@ -908,6 +937,41 @@ static const luaL_reg R_wext[] = {
+@@ -927,6 +956,41 @@ static const luaL_reg R_wext[] = {
  	{ NULL, NULL }
  };
 
@@ -323,7 +323,7 @@
  /* Common */
  static const luaL_reg R_common[] = {
  	{ "type", iwinfo_L_type },
-@@ -919,6 +983,15 @@ static const luaL_reg R_common[] = {
+@@ -938,6 +1002,15 @@ static const luaL_reg R_common[] = {
  LUALIB_API int luaopen_iwinfo(lua_State *L) {
  	luaL_register(L, IWINFO_META, R_common);
 
@@ -1421,7 +1421,7 @@
 +#endif
 --- a/iwinfo_wext.c
 +++ b/iwinfo_wext.c
-@@ -185,7 +185,7 @@ static int wext_get_channel(const char *
+@@ -197,7 +197,7 @@ static int wext_get_center_chan2(const c
  	return -1;
  }
 
@@ -1430,7 +1430,7 @@
  {
  	struct iwreq wrq;
  	struct iw_range range;
-@@ -282,7 +282,7 @@ static int wext_get_noise(const char *if
+@@ -294,7 +294,7 @@ static int wext_get_noise(const char *if
  	return -1;
  }
 
@@ -1439,7 +1439,7 @@
  {
  	struct iwreq wrq;
  	struct iw_statistics stats;
-@@ -300,7 +300,7 @@ static int wext_get_quality(const char *
+@@ -312,7 +312,7 @@ static int wext_get_quality(const char *
  	return -1;
  }
 
@@ -1448,7 +1448,7 @@
  {
  	struct iwreq wrq;
  	struct iw_range range;
-@@ -365,7 +365,7 @@ static int wext_get_txpwrlist(const char
+@@ -377,7 +377,7 @@ static int wext_get_txpwrlist(const char
  	return -1;
  }
 
@@ -1457,7 +1457,7 @@
  {
  	struct iwreq wrq;
  	struct iw_range range;
-@@ -409,7 +409,7 @@ static int wext_get_countrylist(const ch
+@@ -421,7 +421,7 @@ static int wext_get_countrylist(const ch
  	return -1;
  }
 
@@ -1468,7 +1468,7 @@
  	struct iwinfo_freqlist_entry *e = NULL;
 --- a/Makefile
 +++ b/Makefile
-@@ -32,6 +32,15 @@ ifneq ($(filter nl80211,$(IWINFO_BACKEND
+@@ -34,6 +34,15 @@ ifneq ($(filter nl80211,$(IWINFO_BACKEND
  	IWINFO_LIB_OBJ     += iwinfo_nl80211.o
  endif
 
@@ -1482,11 +1482,11 @@
 +   IWINFO_LIB_OBJ += iwinfo_ra.o
 +endif
 
- %.o: %.c
- 	$(CC) $(IWINFO_CFLAGS) $(FPIC) -c -o $@ $<
+ compile: clean $(IWINFO_LIB) $(IWINFO_LUA) $(IWINFO_CLI)
+
 --- a/hardware.txt
 +++ b/hardware.txt
-@@ -173,6 +173,36 @@
+@@ -180,6 +180,36 @@
  0x1814 0x3662 0x1814 0x000d    0      0  "Ralink"   "Rt3662"
  0x1814 0x3883 0x1814 0x000d    0      0  "Ralink"   "Rt3883"
  0x1814 0x5350 0x1814 0x000f    0      0  "Ralink"   "Rt5350"

diff --git a/package/network/utils/iwinfo/patches/002-devices-add-MT7986.patch b/package/network/utils/iwinfo/patches/002-devices-add-MT7986.patch
@@ -14,17 +14,16 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/hardware.txt
 +++ b/hardware.txt
-@@ -196,6 +196,7 @@
+@@ -225,5 +225,6 @@
  0x14c3 0x7650 0x14c3 0x7650    0      0  "MediaTek" "MT7610E"
  0x14c3 0x7662 0x14c3 0x7662    0      0  "MediaTek" "MT76x2E"
  0x14c3 0x7915 0x14c3 0x7915    0      0  "MediaTek" "MT7915E"
 +0x14c3 0x7986 0x14c3 0x7986    0      0  "MediaTek" "MT7986"
  0x14e4 0xaa52 0x14e4 0xaa52    0      0  "Broadcom" "BCM43602"
- 0x02d0 0xa9a6 0x0000 0x0000    0      0  "Cypress"  "CYW43455"
  0x1ae9 0x0310 0x1ae9 0x0000    0      0  "Wilocity" "Wil6210"
 --- a/iwinfo_nl80211.c
 +++ b/iwinfo_nl80211.c
-@@ -3410,7 +3410,13 @@ static int nl80211_hardware_id_from_fdt(struct iwinfo_hardware_id *id, const cha
+@@ -3386,7 +3386,13 @@ static int nl80211_hardware_id_from_fdt(
  		id->device_id = 0x7622;
  		id->subsystem_vendor_id = 0x14c3;
  		id->subsystem_device_id = 0x7622;
@@ -38,5 +37,3 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  	return (id->vendor_id && id->device_id) ? 0 : -1;
  }
 
--- 
-2.30.2
diff --git a/package/network/utils/iwinfo/patches/003-devices-add-IPQ8074.patch b/package/network/utils/iwinfo/patches/003-devices-add-IPQ8074.patch
@@ -0,0 +1,37 @@
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 6 Jan 2023 09:56:54 +0000 (+0100)
+Subject: iwinfo: devices: add Qualcomm Atheros IPQ8074 WiSoC
+X-Git-Url: http://git.openwrt.org/?p=project%2Fiwinfo.git;a=commitdiff_plain;h=5914d7113ecf77de63eb21fc233684d1a1a52ca5
+
+iwinfo: devices: add Qualcomm Atheros IPQ8074 WiSoC
+
+Add detection of the Qualcomm Atheros IPQ8074 WiSoC using the compatible
+string from device tree.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+
+--- a/hardware.txt
++++ b/hardware.txt
+@@ -167,6 +167,7 @@
+ 0x168c 0x003c 0x1a56 0x1420    0      0  "Qualcomm Atheros" "QCA9862"
+ 0x168c 0x003c 0x19b6 0xd03c    0      0  "Mikrotik" "R11e-5HacT"
+ 0x168c 0x003c 0x168c 0x4019    0      0  "Qualcomm Atheros" "IPQ4019"
++0x168c 0x8074 0x168c 0x8074    0      0  "Qualcomm Atheros" "IPQ8074"
+ 0x168c 0x003c 0x19b6 0xd075    0      0  "Mikrotik" "R11e-5HacD"
+ 0x168c 0x0040 0x168c 0x0002    0      0  "Qualcomm Atheros" "QCA9990"
+ 0x168c 0x0046 0x168c 0xcafe    0      0  "Qualcomm Atheros" "QCA9984"
+--- a/iwinfo_nl80211.c
++++ b/iwinfo_nl80211.c
+@@ -3381,6 +3381,11 @@ static int nl80211_hardware_id_from_fdt(
+ 		id->device_id = 0x003c;
+ 		id->subsystem_vendor_id = 0x168c;
+ 		id->subsystem_device_id = 0x4019;
++	} else if (!strcmp(compat, "qcom,ipq8074-wifi")) {
++		id->vendor_id = 0x168c;
++		id->device_id = 0x8074;
++		id->subsystem_vendor_id = 0x168c;
++		id->subsystem_device_id = 0x8074;
+ 	} else if (!strcmp(compat, "mediatek,mt7622-wmac")) {
+ 		id->vendor_id = 0x14c3;
+ 		id->device_id = 0x7622;
diff --git a/package/network/utils/iwinfo/patches/004-devices-add-QCNxxxx.patch b/package/network/utils/iwinfo/patches/004-devices-add-QCNxxxx.patch
@@ -0,0 +1,23 @@
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 6 Jan 2023 16:33:55 +0000 (+0100)
+Subject: devices: add Qualcomm Atheros QCN6024/9024/9074 cards
+X-Git-Url: http://git.openwrt.org/?p=project%2Fiwinfo.git;a=commitdiff_plain;h=c7b420a2f33c6f1034c3e2191eba0cb0374af7b6
+
+devices: add Qualcomm Atheros QCN6024/9024/9074 cards
+
+Add Qualcomm Atheros QCN6024/9024/9074 PCI ID, they all are compatible and
+use the same ID.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+
+--- a/hardware.txt
++++ b/hardware.txt
+@@ -173,6 +173,7 @@
+ 0x168c 0x0046 0x168c 0xcafe    0      0  "Qualcomm Atheros" "QCA9984"
+ 0x168c 0x0050 0x0000 0x0000    0      0  "Qualcomm Atheros" "QCA9887"
+ 0x168c 0x0056 0x0000 0x0000    0      0  "Qualcomm Atheros" "QCA9886"
++0x17cb 0x1104 0x17cb 0x1104    0      0  "Qualcomm Atheros" "QCN6024/9024/9074"
+ 0x1814 0x3050 0x1814 0x0005    0      0  "Ralink"   "Rt3050"
+ 0x1814 0x3051 0x1814 0x0007    0      0  "Ralink"   "Rt3051"
+ 0x1814 0x3052 0x1814 0x0008    0      0  "Ralink"   "Rt3052"
diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
@@ -31,15 +31,14 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
 CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
 CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_FULL_ACCESS_TIME),-DCMAKE_OVL_MOUNT_FULL_ACCESS_TIME=y)
 CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB),-DCMAKE_OVL_MOUNT_COMPRESS_ZLIB=y)
 
 define Package/fstools
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubox +USE_GLIBC:librt +NAND_SUPPORT:ubi-utils
+  DEPENDS:=+ubox +NAND_SUPPORT:ubi-utils
   TITLE:=OpenWrt filesystem tools
   MENU:=1
 endef

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
@@ -35,15 +35,14 @@ ifeq ($(DUMP),)
 endif
 
 CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)"
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
 
 TARGET_CFLAGS += -flto
 TARGET_LDFLAGS += -flto
 
 define Package/procd/Default
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox \
+  DEPENDS:=+ubusd +ubus +libjson-script +ubox +libubox \
 	  +libubus +libblobmsg-json +libjson-c +jshn
   TITLE:=OpenWrt system process manager
   USERID:=:dialout=20 :audio=29

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
@@ -18,12 +18,10 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
-
 define Package/ubox
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
+  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci
   TITLE:=OpenWrt system helper toolbox
   ALTERNATIVES:=\
     100:/sbin/rmmod:/sbin/kmodloader \
@@ -46,7 +44,7 @@ endef
 define Package/logd
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
+  DEPENDS:=+libubox +libubus +libblobmsg-json
   TITLE:=OpenWrt system log implementation
   USERID:=logd=514:logd=514
 endef