[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: default-settings: also including english lang po rockchip: add 6.12 testing kernel support
zesming · Dec 21, 2024 · 2e8edd6 · 2e8edd6
2 parents 6c07fae + b49e92a
commit 2e8edd6
Show file tree

Hide file tree

Showing 40 changed files with 4,559 additions and 2 deletions.
diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile
@@ -18,7 +18,7 @@ define Package/default-settings
   CATEGORY:=LuCI
   TITLE:=LuCI support for Default Settings
   PKGARCH:=all
-  DEPENDS:=+luci-base +luci +@LUCI_LANG_zh-cn +@LUCI_LANG_zh_Hans
+  DEPENDS:=+luci-base +luci +@LUCI_LANG_zh-cn +@LUCI_LANG_zh_Hans +@LUCI_LANG_en
 endef
 
 define Package/default-settings/description

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -197,6 +197,11 @@ ramips_setup_macs()
 		lan_mac=$(macaddr_add "$label_mac" 1)
 		wan_mac=$label_mac
 		;;
+	huasifei,mt7621dtu)
+		label_mac=$(mtd_get_mac_binary factory 0x4)
+		lan_mac=$label_mac
+		wan_mac=$(macaddr_add "$label_mac" 1)
+		;;
 	hiwifi,hc5962)
 		lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
 		label_mac=$lan_mac

diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
@@ -8,7 +8,7 @@ FEATURES:=ext4 audio usb usbgadget display gpio fpu pci pcie rootfs-part boot-pa
 SUBTARGETS:=armv8 rk35xx
 
 KERNEL_PATCHVER:=6.6
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.12
 
 define Target/Description
 	Build firmware image for Rockchip SoC devices.