update

.github/workflows/repo-dispatcher.yml

@@ -127,11 +127,6 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
-          -d '{"event_type": "mediatek_gl_mt7981 ${{ github.event.inputs.param }}", "client_payload": {"target": "mediatek_gl_mt7981"}}'
-          curl \
-          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
-          -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "ramips_mt7621 ${{ github.event.inputs.param }}", "client_payload": {"target": "ramips_mt7621"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
@@ -157,11 +152,6 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
-          -d '{"event_type": "bcm4908_generic ${{ github.event.inputs.param }}", "client_payload": {"target": "bcm4908_generic"}}'
-          curl \
-          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
-          -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "kirkwood_generic ${{ github.event.inputs.param }}", "client_payload": {"target": "kirkwood_generic"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \

devices/armvirt_64/.config

@@ -7,6 +7,8 @@ CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_TARGET_ROOTFS_TARGZ=y
 
+CONFIG_TARGET_ROOTFS_INITRAMFS=n
+
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 

devices/bcm4908_generic/.config

@@ -1,11 +0,0 @@
-
-CONFIG_TARGET_bcm4908=y
-CONFIG_TARGET_bcm4908_generic=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_bcm4908_generic_DEVICE_asus_gt-ac5300=y
-CONFIG_TARGET_DEVICE_bcm4908_generic_DEVICE_netgear_r8000p=y
-
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
-
-
-

devices/bcm4908_generic/diy.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-shopt -s extglob
-
-SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-#bash $SHELL_FOLDER/../common/kernel_5.15.sh
-
-rm -rf package/boot/uboot-bcm4908
-svn co https://github.com/openwrt/openwrt/trunk/package/boot/uboot-bcm4908 package/boot/uboot-bcm4908
-

devices/common/kernel_5.15.sh

@@ -24,7 +24,7 @@ svn export --force  https://github.com/openwrt/packages/trunk/net/xtables-addons
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15
 find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \;
-rm -rf target/linux/generic/backport-5.15/{802-v6.1-nvmem*,803-v5.19-nvmem*,733-v6.2-02-net-mediatek-sgmii-ensure*,733-v6.2-03-net-mediatek*,733-v6.2-04-mtk_sgmii-enable*}
+rm -rf target/linux/generic/backport-5.15/{802-v6.1-nvmem*,803-v5.19-nvmem*,733-v6.2-02-net-mediatek-sgmii-ensure*,733-v6.2-03-net-mediatek*,733-v6.2-04-mtk_sgmii-enable*,730-11-v6.3-net-ethernet-mtk_eth*,775-v5.16-net-phylink*,776-v5.16-net-ethernet-*,612-v6.3-skbuff-Fix*}
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
 
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab

devices/common/patches/fix.patch

@@ -45,7 +45,7 @@
  ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
    define Image/Build/cpiogz
  	( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
-@@ -367,6 +405,7 @@ define Device/Init
+@@ -367,12 +405,13 @@ define Device/Init
    DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
    DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
    IMAGE_SIZE :=
@@ -53,6 +53,41 @@
    KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
    KERNEL_SUFFIX := -kernel.bin
    KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
+   KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
+   KERNEL_INITRAMFS_PREFIX = $$(DEVICE_IMG_PREFIX)-initramfs
+-  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
++  KERNEL_INITRAMFS_IMAGE = $(subst $(IMG_PREFIX_EXTRA),,$(IMG_PREFIX))-$(1)-initramfs$$(KERNEL_INITRAMFS_SUFFIX)
+   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
+   KERNEL_INSTALL :=
+   KERNEL_NAME := vmlinux
+@@ -472,7 +511,6 @@ define Device/Check
+   endif
+ endef
+ 
+-ifndef IB
+ define Device/Build/initramfs
+   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
+   $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+@@ -483,9 +521,11 @@ define Device/Build/initramfs
+   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
+ 	cp $$^ $$@
+ 
++  ifndef IB
+   $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
+ 	@rm -f $$@
+ 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
++  endif
+ 
+   $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,$(1))
+ 
+@@ -519,7 +559,6 @@ define Device/Build/initramfs
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+-endif
+ 
+ define Device/Build/compile
+   $$(_COMPILE_TARGET): $(KDIR)/$(1)
 @@ -568,7 +607,7 @@ define Device/Build/kernel
  endef
  
@@ -62,15 +97,7 @@
    $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
  	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
  	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -606,6 +645,7 @@ define Device/Build/image
- 	FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	FILE_FILESYSTEM="$(1)" \
- 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
-+	KERNEL_INITRAMFS="$(KERNEL_INITRAMFS)" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
- 	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
-@@ -678,6 +718,8 @@ define Device/Build
+@@ -678,6 +717,8 @@ define Device/Build
    $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
    $(call Device/Build/kernel,$(1))
  
@@ -99,14 +126,3 @@
          ],
          stdout=PIPE,
          stderr=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "kernel_initramfs": getenv("KERNEL_INITRAMFS"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/common/patches/imagebuilder.patch

@@ -1,5 +1,14 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
+@@ -26,7 +26,7 @@ all: compile
+ 
+ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+ 	rm -rf $(PKG_BUILD_DIR)
+-	mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
++	mkdir -p $(IB_KDIR)/tmp $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host/lib \
+ 		$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts $(IB_DTSDIR)
+ 	-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
+ 	$(SED) 's/^CONFIG_BINARY_FOLDER=.*/# CONFIG_BINARY_FOLDER is not set/' $(PKG_BUILD_DIR)/.config
 @@ -38,13 +38,16 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
@@ -20,6 +29,14 @@
  
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
  	# create an empty package index so `opkg` doesn't report an error
+@@ -79,6 +82,7 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),)
+ endif
+ 
+ 	$(CP) -L $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
++	$(CP) -L $(KERNEL_BUILD_DIR)/tmp/*initramfs* $(IB_KDIR)/tmp/ || true
+ 	if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \
+ 		$(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/host/lib; \
+ 	fi
 
 --- a/target/imagebuilder/files/Makefile
 +++ b/target/imagebuilder/files/Makefile
@@ -51,7 +68,7 @@
  	$(MAKE) -s build_image
  	$(MAKE) -s json_overview_image_info
  	$(MAKE) -s checksum
-+	rm -rf $(KERNEL_BUILD_DIR)/tmp
++	rm -rf $(KERNEL_BUILD_DIR)/tmp/openwrt-20.*
 +	rm -rf $(KERNEL_BUILD_DIR)/root.*
  
  _call_manifest: FORCE

devices/ipq60xx_generic/.config

@@ -6,6 +6,8 @@ CONFIG_TARGET_ALL_PROFILES=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=n
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=n
 
+CONFIG_TARGET_ROOTFS_INITRAMFS=n
+
 CONFIG_PACKAGE_dockerd=n
 
 CONFIG_GCC_USE_VERSION_7=y

devices/ipq807x_generic/diy.sh

@@ -9,4 +9,6 @@ svn co https://github.com/robimarko/nss-packages/trunk/qca/qca-ssdk-shell packag
 
 sh -c "curl -sfL https://github.com/robimarko/openwrt/commit/23fa931934151f72c1655ffa62ff1a979575f07e.patch | patch -d './' -p1 --forward"
 
+sed -i '/rm -rf $(KDIR)\/tmp/d' include/image.mk
+
 rm -rf feeds/kiddin9/{rtl8821cu,rtl88x2bu} package/kernel/mt76

devices/ipq807x_ipq60xx/diy.sh

@@ -20,6 +20,9 @@ CONFIG_FEED_ipq807x=n
 CONFIG_FEED_wifi_ax=n
 " >> devices/common/.config
 
+rm -rf target/imagebuilder
+svn co https://github.com/openwrt/openwrt/branches/openwrt-21.02/target/imagebuilder target/imagebuilder
+
 rm -rf feeds/kiddin9/{rtl*,base-files,netifd,fullconenat-nft,mbedtls,oaf,shortcut-fe,fullconenat}
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/services/fullconenat feeds/kiddin9/fullconenat
 
@@ -28,7 +31,7 @@ rm -rf feeds/packages/net/xtables-addons package/feeds/packages/{openvswitch,ksm
 
 rm -rf package/kernel/exfat
 
-rm -rf devices/common/patches/{glinet,imagebuilder.patch,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
+rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
 
 rm -rf toolchain/musl
 

devices/ipq807x_ipq60xx/patches/fix.patch

@@ -0,0 +1,59 @@
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -371,7 +370,7 @@ define Device/Init
+   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
+   KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
+   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-initramfs
+-  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
++  KERNEL_INITRAMFS_IMAGE = $(subst $(IMG_PREFIX_EXTRA),,$(IMG_PREFIX))-$(1)-initramfs$$(KERNEL_INITRAMFS_SUFFIX)
+   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
+   KERNEL_INSTALL :=
+   KERNEL_NAME := vmlinux
+@@ -469,7 +468,6 @@ define Device/Check
+   endif
+ endef
+ 
+-ifndef IB
+ define Device/Build/initramfs
+   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
+   $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+@@ -479,9 +477,11 @@ define Device/Build/initramfs
+   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
+ 	cp $$^ $$@
+ 
++  ifndef IB
+   $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
+ 	@rm -f $$@
+ 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
++  endif
+ 
+   $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,$(1))
+ 
+@@ -515,7 +515,6 @@ define Device/Build/initramfs
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+-endif
+ 
+ define Device/Build/compile
+   $$(_COMPILE_TARGET): $(KDIR)/$(1)
+
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+ 
+ 
+ if output:
+-    default_packages, output["arch_packages"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
+         [
+             "make",
+             "--no-print-directory",
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
+             "target/linux/",
+             "val.DEFAULT_PACKAGES",
+             "val.ARCH_PACKAGES",
++            "val.LINUX_VERSION",
+         ],
+         stdout=PIPE,
+         stderr=PIPE,

devices/ipq807x_ipq60xx/patches/imagebuilder.patch

@@ -1,110 +0,0 @@
---- a/target/imagebuilder/Makefile
-+++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
- 		./files/repositories.conf \
- 		$(TMP_DIR)/.targetinfo \
- 		$(TMP_DIR)/.packageinfo \
--		$(PKG_BUILD_DIR)/
-+		$(TOPDIR)/files \
-+		$(PKG_BUILD_DIR)/ || true
- 
--ifeq ($(CONFIG_IB_STANDALONE),)
- 	echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
- 	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
- 	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
--endif
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/releases\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
- 
- 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
- 	# create an empty package index so `opkg` doesn't report an error
-
---- a/target/imagebuilder/files/Makefile
-+++ b/target/imagebuilder/files/Makefile
-@@ -115,17 +115,32 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
- PACKAGES:=
- 
- _call_image: staging_dir/host/.prereq-build
-+	[ "$(DATE)" ] && DATE="$(DATE)" || DATE="`date +'%m.%d.%Y'`"; \
-+	mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
-+	echo -e " \
-+	sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
-+	sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(ROOTFS_PARTSIZE)'/\" /etc/openwrt_release \n \
-+	sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
-+	echo \"$$DATE\" >/etc/openwrt_version \n \
-+	"> $(USER_FILES)/etc/uci-defaults/99-version; \
- 	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
- 	echo 'Packages: $(BUILD_PACKAGES)'
- 	echo
- 	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
- 	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
-+	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
-+	else \
-+		sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
-+	fi
- 	$(MAKE) package_reload
- 	$(MAKE) package_install
- 	$(MAKE) -s prepare_rootfs
- 	$(MAKE) -s build_image
- 	$(MAKE) -s json_overview_image_info
- 	$(MAKE) -s checksum
-+	rm -rf $(KERNEL_BUILD_DIR)/tmp
-+	rm -rf $(KERNEL_BUILD_DIR)/root.*
- 
- _call_manifest: FORCE
- 	rm -rf $(TARGET_DIR)
-@@ -166,7 +181,14 @@ package_install: FORCE
- 	@echo Installing packages...
- 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
- 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
--	$(OPKG) install $(BUILD_PACKAGES)
-+	for p in $(BUILD_PACKAGES); do \
-+		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
-+			packages+="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn "; \
-+		fi \
-+	done; \
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en; \
-+	$(OPKG) install $$packages || true
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
- 
- prepare_rootfs: FORCE
- 	@echo
-@@ -180,12 +202,15 @@ prepare_rootfs: FORCE
- 		) \
- 	)
- 	$(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))
-+	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
-+	fi
- 
- build_image: FORCE
- 	@echo
- 	@echo Building images...
- 	rm -rf $(BUILD_DIR)/json_info_files/
--	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
-+	nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
- 		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
- 
- $(BIN_DIR)/profiles.json: FORCE
-
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-         ],
-         stdout=PIPE,
-         stderr=PIPE,

devices/ipq807x_ipq60xx/patches/targets.patch

@@ -13,7 +13,7 @@
 +	kmod-ipt-nat6 \
  	odhcp6c \
  	odhcpd-ipv6only \
-@@ -83,4 +85,20 @@
+@@ -83,4 +85,16 @@
      -include ./$(SUBTARGET)/target.mk
    endif
 +endif
@@ -23,14 +23,10 @@
 +endif
 +
 +ifeq ($(ARCH),arm)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++  DEFAULT_PACKAGES+=luci-app-cpufreq
 +endif
 +
 +ifeq ($(ARCH),aarch64)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
-+endif
-+
-+ifneq ($(CONFIG_USB_SUPPORT),)
-+  DEFAULT_PACKAGES+=automount
++  DEFAULT_PACKAGES+=luci-app-cpufreq
  endif
  

devices/kirkwood_generic/.config

@@ -4,7 +4,9 @@ CONFIG_TARGET_kirkwood_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_kirkwood_DEVICE_linksys_e4200-v2=y
 CONFIG_TARGET_DEVICE_kirkwood_DEVICE_linksys_ea4500=y
+CONFIG_TARGET_DEVICE_kirkwood_DEVICE_linksys_ea3500=y
 CONFIG_TARGET_DEVICE_kirkwood_DEVICE_checkpoint_l-50=y
+CONFIG_TARGET_DEVICE_kirkwood_DEVICE_netgear_readynas-duo-v2=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/kirkwood_generic/diy.sh

@@ -3,6 +3,6 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
+#bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 

devices/mediatek_filogic/.config

@@ -2,9 +2,10 @@
 CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_asus_tuf-ax4200=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_bananapi_bpi-r3=y
-CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_asus_tuf-ax4200=n
-CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-stock=y
-CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-ubootmod=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr4288=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6086=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6088=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/mediatek_gl_mt7981/.config

@@ -1,32 +0,0 @@
-
-CONFIG_TARGET_mediatek_gl=y
-CONFIG_TARGET_mediatek_gl_mt7981=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_ALL_PROFILES=y
-
-#CONFIG_TARGET_DEVICE_mediatek_gl_mt7981_DEVICE_glinet_gl-mt2500=y
-#CONFIG_TARGET_DEVICE_mediatek_gl_mt7981_DEVICE_glinet_gl-mt3000=y
-
-CONFIG_PACKAGE_kmod-nft-fullcone=n
-CONFIG_PACKAGE_kmod-ax25=n
-CONFIG_PACKAGE_kmod-fast-classifier=n
-CONFIG_PACKAGE_kmod-shortcut-fe=n
-CONFIG_PACKAGE_kmod-shortcut-fe-cm=n
-CONFIG_PACKAGE_kmod-mpls=n
-CONFIG_PACKAGE_kmod-netem=n
-CONFIG_PACKAGE_kmod-sched=n
-CONFIG_PACKAGE_kmod-sched-act-vlan=n
-CONFIG_PACKAGE_kmod-sched-bpf=n
-CONFIG_PACKAGE_kmod-sched-cake=n
-CONFIG_PACKAGE_kmod-sched-connmark=n
-CONFIG_PACKAGE_kmod-sched-core=n
-CONFIG_PACKAGE_kmod-sched-ctinfo=n
-CONFIG_PACKAGE_kmod-sched-flower=n
-CONFIG_PACKAGE_kmod-sched-ipset=n
-CONFIG_PACKAGE_kmod-sched-mqprio=n
-CONFIG_PACKAGE_dockerd=n
-
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
-
-
-

devices/mediatek_gl_mt7981/diy.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-shopt -s extglob
-
-SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-
-rm -rf package/feeds
-./scripts/feeds install -a -p gl_feed_mtk -f
-./scripts/feeds install -a -p gl_feed_common -f
-./scripts/feeds install -a -p gl_feed_21_02 -f
-./scripts/feeds install -a -p mtk_openwrt_feed -f
-./scripts/feeds install -a -p kiddin9 -f
-./scripts/feeds install -a
-
-rm -rf package/feeds/kiddin9/{rtl*,base-files,netifd}
-
-rm -rf package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch
-
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/utils/iwinfo/Makefile
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/config/netifd/Makefile
-
-rm -rf devices/common/patches/{imagebuilder.patch,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
-
-sed -i "s/BOARD:=mediatek$/BOARD:=mediatek_gl/" target/linux/mediatek/Makefile
-sed -i "s/TARGET_mediatek/TARGET_mediatek_gl/" target/linux/mediatek/modules.mk
-
-mv -f target/linux/mediatek target/linux/mediatek_gl
-
-rm -rf toolchain/musl
-
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
-
-echo "
-CONFIG_FEED_gl_feed_mtk=n
-CONFIG_FEED_gl_feed_common=n
-CONFIG_FEED_gl_feed_21_02=n
-CONFIG_FEED_mtk_openwrt_feed=n
-" >> devices/common/.config
-
-

devices/mediatek_gl_mt7981/feeds.conf

@@ -1,8 +0,0 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-22.03
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-22.03
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-22.03
-src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
-src-git gl_feed_mtk https://github.com/gl-inet/gl-feeds.git;mtk
-src-git mtk_openwrt_feed https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git^df3fc79
-src-git gl_feed_common https://github.com/gl-inet/gl-feeds.git;common
-src-git gl_feed_21_02 https://github.com/gl-inet/gl-feeds.git;21.02.2

devices/mediatek_gl_mt7981/patches/0999-depends.patch

@@ -1,57 +0,0 @@
---- a/target/linux/mediatek_gl/Makefile
-+++ a/target/linux/mediatek_gl/Makefile
-@@ -10,9 +10,9 @@
- 
- KERNEL_PATCHVER:=5.4
- KERNEL_TESTING_PATCHVER:=5.4
- 
- include $(INCLUDE_DIR)/target.mk
- DEFAULT_PACKAGES += \
--	kmod-leds-gpio kmod-gpio-button-hotplug
-+	kmod-leds-gpio kmod-gpio-button-hotplug wpad-basic-wolfssl ethtool iwinfo wireless-tools kmod-mediatek_hnat mii_mgr mtkhnat_util regs fwdd kmod-mtfwd kmod-mtqos
- 
- $(eval $(call BuildTarget))
-
---- a/target/linux/mediatek_gl/image/mt7981.mk
-+++ b/target/linux/mediatek_gl/image/mt7981.mk
-@@ -175,13 +175,13 @@
- define Device/glinet_gl-mt3000
-   DEVICE_VENDOR := GL.iNet
-   DEVICE_MODEL := GL-MT3000
-   DEVICE_DTS := mt7981-gl-mt3000
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-   SUPPORTED_DEVICES := glinet,mt3000-snand
--  DEVICE_PACKAGES := kmod-hwmon-pwmfan
-+  DEVICE_PACKAGES := kmod-hwmon-pwmfan gl-sdk4-mtk-wifi-v2 kmod-conninfra-mt7981-ko kmod-mt-wifi-mt7981-ko kmod-warp-mt7981-ko kmod-gl-sdk4-fan 8021xd
-   UBINIZE_OPTS := -E 5
-   BLOCKSIZE := 128k
-   PAGESIZE := 2048
-   IMAGE_SIZE := 65536k
-   KERNEL_IN_UBI := 1
-   IMAGES := factory.img sysupgrade.tar
-@@ -197,5 +197,5 @@
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-   SUPPORTED_DEVICES := glinet,x3000-emmc
--  DEVICE_PACKAGES := kmod-hwmon-pwmfan mkf2fs kmod-mmc kmod-fs-f2fs gdisk
-+  DEVICE_PACKAGES := kmod-hwmon-pwmfan mkf2fs kmod-mmc kmod-fs-f2fs gdisk mmc-utils losetup blockdev gl-sdk4-mtk-wifi-v2 kmod-conninfra-mt7981-ko kmod-mt-wifi-mt7981-ko kmod-warp-mt7981-ko kmod-gl-sdk4-fan kmod-shortcut-fe kmod-shortcut-fe-cm 8021xd
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-gl-metadata
- endef
-@@ -208,5 +208,5 @@
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-   SUPPORTED_DEVICES := glinet,xe3000-emmc
--  DEVICE_PACKAGES := kmod-hwmon-pwmfan mkf2fs kmod-mmc kmod-fs-f2fs gdisk
-+  DEVICE_PACKAGES := kmod-hwmon-pwmfan mkf2fs kmod-mmc kmod-fs-f2fs gdisk mmc-utils losetup blockdev gl-sdk4-mtk-wifi-v2 kmod-conninfra-mt7981-ko kmod-mt-wifi-mt7981-ko kmod-warp-mt7981-ko kmod-gl-sdk4-fan kmod-shortcut-fe kmod-shortcut-fe-cm 8021xd
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-gl-metadata
- endef
-@@ -215,10 +215,10 @@
- define Device/glinet_gl-mt2500
-   DEVICE_VENDOR := GL.iNet
-   DEVICE_MODEL := GL-MT2500
-   DEVICE_DTS := mt7981-gl-mt2500
-   SUPPORTED_DEVICES := glinet,mt2500-emmc
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
--  DEVICE_PACKAGES := mkf2fs kmod-mmc kmod-fs-f2fs gdisk
-+  DEVICE_PACKAGES := mkf2fs kmod-mmc kmod-fs-f2fs gdisk losetup e2fsprogs blockdev blkid kmod-nls-cp437 mtk_factory_rw mmc-utils
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-gl-metadata
- endef
- TARGET_DEVICES += glinet_gl-mt2500

devices/mediatek_gl_mt7981/patches/base-files.patch

@@ -1,108 +0,0 @@
---- a/package/base-files/files/etc/rc.common
-+++ b/package/base-files/files/etc/rc.common
-@@ -28,7 +28,10 @@ restart() {
- }
- 
- boot() {
--	start "$@"
-+	name="$(basename "${initscript}")"
-+	name="${name##S[0-9][0-9]}"
-+	[[ "$(uci -q get $name.$name[0].enabled)" == 0 || "$(uci -q get $name.config.enabled)" == 0 || "$(uci -q get $name.$name.enabled)" == 0 || "$(uci -q get $name.main.enabled)" == 0 || "$(uci -q get $name.$name[0].enable)" == 0 || "$(uci -q get $name.config.enable)" == 0 || "$(uci -q get $name.$name.enable)" == 0 || "$(uci -q get $name.main.enable)" == 0 ]] || start "$@";
-+	
- }
- 
- shutdown() {
-
---- a/package/base-files/files/lib/functions.sh
-+++ b/package/base-files/files/lib/functions.sh
-@@ -283,10 +283,13 @@ default_postinst() {
- 			if [ "$PKG_UPGRADE" != "1" ]; then
- 				"$i" enable
- 			fi
--			"$i" start
-+			if "$i" enabled; then
-+				"$i" start
-+			fi
- 		fi
- 	done
- 
-+	[ -x /etc/init.d/ucitrack ] && /etc/init.d/ucitrack reload
- 	return $ret
- }
- 
-
---- a/package/base-files/files/etc/shinit
-+++ b/package/base-files/files/etc/shinit
-@@ -2,6 +2,8 @@
- [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
- 
- alias ll='ls -alF --color=auto'
-+alias reboot='(/bin/busybox reboot &);sleep 3;/bin/busybox reboot -f'
-+PS1='\[\e[32m\][\[\e[m\]\[\e[31m\]\u\[\e[m\]\[\e[33m\]@\[\e[m\]\[\e[32m\]\h\[\e[m\]:\[\e[m\]\[\e[32m\]\[\e[1;32m\]\@\[\e[36m\] \w\[\e[m\]\[\e[32m\]]\[\e[0m\] \$\[\e[m\] '
- 
- [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
-
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -231,24 +231,15 @@ do_save_conffiles() {
- 	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
- 
- 	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
--		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
--		mkdir -p "$ETCBACKUP_DIR"
--		# Avoid touching filesystem on each backup
--		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
--		mkdir -p "$RAMFS/upper" "$RAMFS/work"
--		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
--			UMOUNT_ETCBACKUP_DIR=1 || {
--				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
--				ask_bool 0 "Abort" && exit
--			}
--
--		# Format: pkg-name<TAB>{rom,overlay,unkown}
--		# rom is used for pkgs in /rom, even if updated later
--		find /usr/lib/opkg/info -name "*.control" \( \
--			\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
--			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
--			\( -exec echo {} unknown \; \) \
--			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
-+		. /etc/profile.d/opkg.sh && opkg save
-+		[ -f /rom/etc/uci-defaults/zz-asu-defaults ] && {
-+		 cp -f /rom/etc/uci-defaults/zz-asu-defaults /etc/uci-defaults/zz-asu-defaults
-+		 echo "/etc/uci-defaults/zz-asu-defaults" >> $CONFFILES
-+		}
-+	else
-+		uci -q del opkg.auto
-+		uci -q del opkg.custom
-+		uci commit opkg
- 	fi
- 
- 	v "Saving config files..."
-
---- a/package/base-files/files/etc/profile
-+++ b/package/base-files/files/etc/profile
-@@ -22,7 +23,11 @@ esac
- 
- [ -n "$FAILSAFE" ] || {
- 	for FILE in /etc/profile.d/*.sh; do
--		[ -e "$FILE" ] && . "$FILE"
-+		if [ "$FILE" == "/etc/profile.d/sysinfo.sh" ]; then
-+		 [ "$(which bash)" ] && env -i bash "$FILE"
-+		else
-+		 [ -e "$FILE" ] && . "$FILE"
-+		fi
- 	done
- 	unset FILE
- }
-
---- a/package/base-files/files/lib/preinit/02_sysinfo
-+++ b/package/base-files/files/lib/preinit/02_sysinfo
-@@ -5,6 +5,7 @@ do_sysinfo_generic() {
- 		echo "$(strings /proc/device-tree/compatible | head -1)" > /tmp/sysinfo/board_name
- 	[ ! -e /tmp/sysinfo/model -a -e /proc/device-tree/model ] && \
- 		echo "$(cat /proc/device-tree/model)" > /tmp/sysinfo/model
-+	sed -i "s/mediatek_gl/mediatek/" /tmp/sysinfo/board_name
- }
- 
- boot_hook_add preinit_main do_sysinfo_generic
-

devices/mediatek_gl_mt7981/patches/imagebuilder.patch

@@ -1,110 +0,0 @@
---- a/target/imagebuilder/Makefile
-+++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
- 		./files/repositories.conf \
- 		$(TMP_DIR)/.targetinfo \
- 		$(TMP_DIR)/.packageinfo \
--		$(PKG_BUILD_DIR)/
-+		$(TOPDIR)/files \
-+		$(PKG_BUILD_DIR)/ || true
- 
--ifeq ($(CONFIG_IB_STANDALONE),)
- 	echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf
- 	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
- 	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
--endif
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/releases\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
- 
- 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
- 	# create an empty package index so `opkg` doesn't report an error
-
---- a/target/imagebuilder/files/Makefile
-+++ b/target/imagebuilder/files/Makefile
-@@ -115,17 +115,32 @@ BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(fi
- PACKAGES:=
- 
- _call_image: staging_dir/host/.prereq-build
-+	[ "$(DATE)" ] && DATE="$(DATE)" || DATE="`date +'%m.%d.%Y'`"; \
-+	mkdir -p $(USER_FILES)/etc/uci-defaults || true; \
-+	echo -e " \
-+	sed -i \"s/[0-9]\+.[0-9]\+.[0-9]\{4\}/$$DATE/\" /etc/openwrt_release \n \
-+	sed -i \"s/DISTRIB_ID=.*/DISTRIB_ID='$(ROOTFS_PARTSIZE)'/\" /etc/openwrt_release \n \
-+	sed -i \"s/OpenWrt .* by/OpenWrt $$DATE by/\" /etc/banner \n \
-+	echo \"$$DATE\" >/etc/openwrt_version \n \
-+	"> $(USER_FILES)/etc/uci-defaults/99-version; \
- 	echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
- 	echo 'Packages: $(BUILD_PACKAGES)'
- 	echo
- 	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
- 	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
-+	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
-+	else \
-+		sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
-+	fi
- 	$(MAKE) package_reload
- 	$(MAKE) package_install
- 	$(MAKE) -s prepare_rootfs
- 	$(MAKE) -s build_image
- 	$(MAKE) -s json_overview_image_info
- 	$(MAKE) -s checksum
-+	rm -rf $(KERNEL_BUILD_DIR)/tmp
-+	rm -rf $(KERNEL_BUILD_DIR)/root.*
- 
- _call_manifest: FORCE
- 	rm -rf $(TARGET_DIR)
-@@ -166,7 +181,14 @@ package_install: FORCE
- 	@echo Installing packages...
- 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk))
- 	$(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk))
--	$(OPKG) install $(BUILD_PACKAGES)
-+	for p in $(BUILD_PACKAGES); do \
-+		if [[ $$p == luci-app-* && "`$(OPKG) list | grep luci-i18n-\`echo $$p | cut -d - -f 3-\`-zh-cn`" ]]; then \
-+			packages+="luci-i18n-`echo $$p | cut -d - -f 3-`-zh-cn "; \
-+		fi \
-+	done; \
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends $(BUILD_PACKAGES) luci-i18n-base-zh-cn luci-i18n-base-en; \
-+	$(OPKG) install $$packages || true
-+	$(OPKG) install --force-overwrite --force-checksum --force-depends --force-maintainer --force-reinstall my-default-settings
- 
- prepare_rootfs: FORCE
- 	@echo
-@@ -180,12 +202,15 @@ prepare_rootfs: FORCE
- 		) \
- 	)
- 	$(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))
-+	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
-+	fi
- 
- build_image: FORCE
- 	@echo
- 	@echo Building images...
- 	rm -rf $(BUILD_DIR)/json_info_files/
--	$(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
-+	nice -n 19 $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \
- 		$(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
- 
- $(BIN_DIR)/profiles.json: FORCE
-
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-         ],
-         stdout=PIPE,
-         stderr=PIPE,

devices/mediatek_gl_mt7981/patches/inet-diag.patch

@@ -1,30 +0,0 @@
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -1259,4 +1259,27 @@
- $(eval $(call KernelPackage,netlink-diag))
- 
-+define KernelPackage/inet-diag
-+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-+  TITLE:=INET diag support for ss utility
-+  KCONFIG:= \
-+	CONFIG_INET_DIAG \
-+	CONFIG_INET_TCP_DIAG \
-+	CONFIG_INET_UDP_DIAG \
-+	CONFIG_INET_RAW_DIAG \
-+	CONFIG_INET_DIAG_DESTROY=n
-+  FILES:= \
-+	$(LINUX_DIR)/net/ipv4/inet_diag.ko \
-+	$(LINUX_DIR)/net/ipv4/tcp_diag.ko \
-+	$(LINUX_DIR)/net/ipv4/udp_diag.ko \
-+	$(LINUX_DIR)/net/ipv4/raw_diag.ko
-+  AUTOLOAD:=$(call AutoLoad,31,inet_diag tcp_diag udp_diag raw_diag)
-+endef
-+
-+define KernelPackage/inet-diag/description
-+Support for INET (TCP, DCCP, etc) socket monitoring interface used by
-+native Linux tools such as ss.
-+endef
-+
-+$(eval $(call KernelPackage,inet-diag))
- 
- define KernelPackage/wireguard

devices/mediatek_gl_mt7981/patches/targets.patch

@@ -1,36 +0,0 @@
---- a/include/target.mk
-+++ b/include/target.mk
-@@ -44,9 +44,11 @@
- # For router targets
- DEFAULT_PACKAGES.router:=\
--	dnsmasq \
-+	dnsmasq-full \
- 	firewall \
- 	ip6tables \
- 	iptables \
- 	kmod-ipt-offload \
-+	kmod-ipt-nat \
-+	kmod-ipt-nat6 \
- 	odhcp6c \
- 	odhcpd-ipv6only \
-@@ -83,4 +85,20 @@
-     -include ./$(SUBTARGET)/target.mk
-   endif
-+endif
-+
-+ifneq ($(CONFIG_SMALL_FLASH),)
-+  DEFAULT_PACKAGES+=-coremark -htop -bash -openssh-sftp-server
-+endif
-+
-+ifeq ($(ARCH),arm)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
-+endif
-+
-+ifeq ($(ARCH),aarch64)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
-+endif
-+
-+ifneq ($(CONFIG_USB_SUPPORT),)
-+  DEFAULT_PACKAGES+=automount
- endif
- 

devices/mediatek_mt7981/.config

@@ -2,6 +2,10 @@
 CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_mt7981=y
 CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-mt2500=y
+CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-mt3000=y
+CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-x3000=y
+CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-xe3000=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_mt7981-360-t7-108M=y
 
 CONFIG_VERSION_DIST="OpenWrt"

devices/mediatek_mt7981/patches/fix.patch

@@ -1,3 +1,43 @@
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -371,7 +370,7 @@ define Device/Init
+   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
+   KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
+   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-initramfs
+-  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
++  KERNEL_INITRAMFS_IMAGE = $(subst $(IMG_PREFIX_EXTRA),,$(IMG_PREFIX))-$(1)-initramfs$$(KERNEL_INITRAMFS_SUFFIX)
+   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
+   KERNEL_INSTALL :=
+   KERNEL_NAME := vmlinux
+@@ -469,7 +468,6 @@ define Device/Check
+   endif
+ endef
+ 
+-ifndef IB
+ define Device/Build/initramfs
+   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
+   $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+@@ -479,9 +477,11 @@ define Device/Build/initramfs
+   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
+ 	cp $$^ $$@
+ 
++  ifndef IB
+   $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
+ 	@rm -f $$@
+ 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
++  endif
+ 
+   $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,$(1))
+ 
+@@ -515,7 +515,6 @@ define Device/Build/initramfs
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+-endif
+ 
+ define Device/Build/compile
+   $$(_COMPILE_TARGET): $(KDIR)/$(1)
+
 --- a/scripts/json_overview_image_info.py
 +++ b/scripts/json_overview_image_info.py
 @@ -47,7 +47,7 @@ def get_initial_output(image_info):
@@ -5,27 +45,15 @@
  
  if output:
 -    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"], output["initramfs"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
          [
              "make",
              "--no-print-directory",
-@@ -55,6 +55,8 @@ def get_initial_output(image_info):
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
              "target/linux/",
              "val.DEFAULT_PACKAGES",
              "val.ARCH_PACKAGES",
 +            "val.LINUX_VERSION",
-+            "val.KERNEL_INITRAMFS",
          ],
          stdout=PIPE,
          stderr=PIPE,
-
---- a/rules.mk
-+++ b/rules.mk
-@@ -59,6 +59,7 @@ _SINGLE=export MAKEFLAGS=$(space);
- CFLAGS:=
- ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
- ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
-+KERNEL_INITRAMFS:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_INITRAMFS))
- BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
- SUBTARGET:=$(call qstrip,$(CONFIG_TARGET_SUBTARGET))
- TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))

devices/mediatek_mt7981/patches/targets.patch

@@ -1,6 +1,6 @@
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -46,28 +46,31 @@ DEFAULT_PACKAGES.router:=\
+@@ -46,28 +46,27 @@ DEFAULT_PACKAGES.router:=\
  	dnsmasq-full \
  	firewall \
  	iptables \
@@ -33,15 +33,11 @@
  endif
  
 +ifeq ($(ARCH),arm)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++  DEFAULT_PACKAGES+=luci-app-cpufreq
 +endif
 +
 +ifeq ($(ARCH),aarch64)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
-+endif
-+
-+ifneq ($(CONFIG_USB_SUPPORT),)
-+  DEFAULT_PACKAGES+=automount
++  DEFAULT_PACKAGES+=luci-app-cpufreq
 +endif
 +
  target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))

devices/mediatek_mt7986/patches/fix.patch

@@ -1,3 +1,43 @@
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -371,7 +370,7 @@ define Device/Init
+   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
+   KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
+   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-initramfs
+-  KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
++  KERNEL_INITRAMFS_IMAGE = $(subst $(IMG_PREFIX_EXTRA),,$(IMG_PREFIX))-$(1)-initramfs$$(KERNEL_INITRAMFS_SUFFIX)
+   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
+   KERNEL_INSTALL :=
+   KERNEL_NAME := vmlinux
+@@ -469,7 +468,6 @@ define Device/Check
+   endif
+ endef
+ 
+-ifndef IB
+ define Device/Build/initramfs
+   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
+   $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+@@ -479,9 +477,11 @@ define Device/Build/initramfs
+   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
+ 	cp $$^ $$@
+ 
++  ifndef IB
+   $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
+ 	@rm -f $$@
+ 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
++  endif
+ 
+   $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,$(1))
+ 
+@@ -515,7 +515,6 @@ define Device/Build/initramfs
+ 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
+ 	$(TOPDIR)/scripts/json_add_image_info.py $$@
+ endef
+-endif
+ 
+ define Device/Build/compile
+   $$(_COMPILE_TARGET): $(KDIR)/$(1)
+
 --- a/scripts/json_overview_image_info.py
 +++ b/scripts/json_overview_image_info.py
 @@ -47,7 +47,7 @@ def get_initial_output(image_info):
@@ -5,27 +45,15 @@
  
  if output:
 -    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"], output["initramfs"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
          [
              "make",
              "--no-print-directory",
-@@ -55,6 +55,8 @@ def get_initial_output(image_info):
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
              "target/linux/",
              "val.DEFAULT_PACKAGES",
              "val.ARCH_PACKAGES",
 +            "val.LINUX_VERSION",
-+            "val.KERNEL_INITRAMFS",
          ],
          stdout=PIPE,
          stderr=PIPE,
-
---- a/rules.mk
-+++ b/rules.mk
-@@ -59,6 +59,7 @@ _SINGLE=export MAKEFLAGS=$(space);
- CFLAGS:=
- ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
- ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES))
-+KERNEL_INITRAMFS:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_INITRAMFS))
- BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
- SUBTARGET:=$(call qstrip,$(CONFIG_TARGET_SUBTARGET))
- TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))

devices/mediatek_mt7986/patches/targets.patch

@@ -1,6 +1,6 @@
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -46,28 +46,31 @@ DEFAULT_PACKAGES.router:=\
+@@ -46,28 +46,27 @@ DEFAULT_PACKAGES.router:=\
  	dnsmasq-full \
  	firewall \
  	iptables \
@@ -33,15 +33,11 @@
  endif
  
 +ifeq ($(ARCH),arm)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++  DEFAULT_PACKAGES+=luci-app-cpufreq
 +endif
 +
 +ifeq ($(ARCH),aarch64)
-+  DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
-+endif
-+
-+ifneq ($(CONFIG_USB_SUPPORT),)
-+  DEFAULT_PACKAGES+=automount
++  DEFAULT_PACKAGES+=luci-app-cpufreq
 +endif
 +
  target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))

devices/rockchip_armv8/diy.sh

@@ -18,8 +18,6 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/ker
 svn co https://github.com/openwrt/openwrt/trunk/package/kernel/mt76 package/feeds/kiddin9/mt76
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/feeds/kiddin9/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
 
-svn co https://github.com/openwrt/openwrt/trunk/package/network/services/hostapd  package/feeds/kiddin9/hostapd
-
 sed -i "/KernelPackage,ptp/d" package/kernel/linux/modules/other.mk
 
 mv -f tmp/r8125 feeds/kiddin9/

devices/rockchip_armv8/patches/fan.patch

@@ -0,0 +1,175 @@
+From 6bd64bbc79b7a86224dea328dee07fa27f2cc06b Mon Sep 17 00:00:00 2001
+From: Lawrence-Tang <[email protected]>
+Date: Wed, 20 Oct 2021 15:00:23 +0800
+Subject: [PATCH] rockchip: add fan control for r2s/r4s
+
+---
+ .../armv8/base-files/etc/init.d/fa-fancontrol | 16 ++++
+ .../armv8/base-files/usr/bin/cputemp.sh       | 14 ++++
+ .../usr/bin/fa-fancontrol-direct.sh           | 69 +++++++++++++++++++
+ .../armv8/base-files/usr/bin/fa-fancontrol.sh | 36 ++++++++++
+ 4 files changed, 127 insertions(+)
+ create mode 100755 target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol
+ create mode 100755 target/linux/rockchip/armv8/base-files/usr/bin/cputemp.sh
+ create mode 100755 target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh
+ create mode 100755 target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh
+
+diff --git a/target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol b/target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol
+new file mode 100755
+index 0000000000000..dd848927101b0
+--- /dev/null
++++ b/target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol
+@@ -0,0 +1,16 @@
++#!/bin/sh /etc/rc.common
++
++START=21
++start() {
++    /usr/bin/fa-fancontrol.sh &
++}
++
++stop() {
++kill -9 $(ps -w | grep fa-fancontrol | grep -v grep | awk '{print$1}') 2>/dev/null
++}
++
++restart() {
++stop
++start
++}
++
+diff --git a/target/linux/rockchip/armv8/base-files/usr/bin/cputemp.sh b/target/linux/rockchip/armv8/base-files/usr/bin/cputemp.sh
+new file mode 100755
+index 0000000000000..e497269bccdcd
+--- /dev/null
++++ b/target/linux/rockchip/armv8/base-files/usr/bin/cputemp.sh
+@@ -0,0 +1,14 @@
++#!/bin/bash
++
++while true
++do
++echo "-----------------"
++echo "Curr freq: `cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq`,`cat /sys/devices/system/cpu/cpu4/cpufreq/cpuinfo_cur_freq`"
++echo "Temp: `cat /sys/class/thermal/thermal_zone0/temp`"
++if [ -d /sys/devices/platform/pwm-fan ]; then
++    CUR=`cat /sys/devices/virtual/thermal/cooling_device0/cur_state`
++    MAX=`cat /sys/devices/virtual/thermal/cooling_device0/max_state`
++    echo "Fan Level: ${CUR}/${MAX}"
++fi
++sleep 5
++done
+diff --git a/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh b/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh
+new file mode 100755
+index 0000000000000..b16c994d66955
+--- /dev/null
++++ b/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh
+@@ -0,0 +1,69 @@
++#!/bin/bash
++
++# determine fan controller
++if [ -d /sys/devices/platform/pwm-fan ]; then
++    echo "pls use /usr/bin/fa-fancontrol.sh."
++    exit 1
++fi
++
++if [ ! -d /sys/class/pwm/pwmchip1 ]; then
++    echo "this model does not support pwm."
++    exit 1
++fi
++if [ ! -d /sys/class/pwm/pwmchip1/pwm0 ]; then
++    echo 0 > /sys/class/pwm/pwmchip1/export
++fi
++sleep 1
++while [ ! -d /sys/class/pwm/pwmchip1/pwm0 ];
++do
++    sleep 1
++done
++ISENABLE=`cat /sys/class/pwm/pwmchip1/pwm0/enable`
++if [ $ISENABLE -eq 1 ]; then
++    echo 0 > /sys/class/pwm/pwmchip1/pwm0/enable
++fi
++echo 50000 > /sys/class/pwm/pwmchip1/pwm0/period
++echo 1 > /sys/class/pwm/pwmchip1/pwm0/enable
++
++# max speed run 5s
++echo 46990 > /sys/class/pwm/pwmchip1/pwm0/duty_cycle
++sleep 5
++echo 25000 > /sys/class/pwm/pwmchip1/pwm0/duty_cycle
++
++# declare -a CpuTemps=(55000 43000 38000 32000)
++# declare -a PwmDutyCycles=(1000 20000 30000 45000)
++
++declare -a CpuTemps=(75000 63000 58000 52000)
++declare -a PwmDutyCycles=(25000 35000 45000 46990)
++
++declare -a Percents=(100 75 50 25)
++DefaultDuty=49990
++DefaultPercents=0
++
++while true
++do
++	temp=$(cat /sys/class/thermal/thermal_zone0/temp)
++	INDEX=0
++	FOUNDTEMP=0
++	DUTY=$DefaultDuty
++	PERCENT=$DefaultPercents
++	
++	for i in 0 1 2 3; do
++		if [ $temp -gt ${CpuTemps[$i]} ]; then
++			INDEX=$i
++			FOUNDTEMP=1
++			break
++		fi	
++	done
++	if [ ${FOUNDTEMP} == 1 ]; then
++		DUTY=${PwmDutyCycles[$i]}
++		PERCENT=${Percents[$i]}
++	fi
++
++	echo $DUTY > /sys/class/pwm/pwmchip1/pwm0/duty_cycle;
++
++        # echo "temp: $temp, duty: $DUTY, ${PERCENT}%"
++        # cat /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_cur_freq
++
++	sleep 2s;
++done
+diff --git a/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh b/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh
+new file mode 100755
+index 0000000000000..e7c14054c80e9
+--- /dev/null
++++ b/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh
+@@ -0,0 +1,36 @@
++#!/bin/bash
++
++# determine fan controller
++if [ -d /sys/devices/platform/pwm-fan ]; then
++    (cd /sys/devices/virtual/thermal/thermal_zone0 && {        
++        logger -p user.info -t "pwmfan" "set the conditions for fan"
++        [ -f trip_point_3_temp ] && {
++            # select fan level 1
++            echo 50000 > trip_point_3_temp
++        }
++        [ -f trip_point_4_temp ] && {
++            # select fan level 2-4
++            echo 55000 > trip_point_4_temp
++        }
++    })
++
++    (cd /sys/devices/virtual/thermal/cooling_device0 && {
++        TYPE=`cat type`
++        if [ $TYPE = 'pwm-fan' ]; then
++            # run 5s
++            for i in `seq 1 5`; do
++                logger -p user.info -t "pwmfan" "start to spin ${i}/5"
++                echo 3 > cur_state
++                sleep 1
++            done
++            logger -p user.info -t "pwmfan" "set to auto"
++            echo 0 > cur_state
++        fi
++    })
++else
++    logger -p user.info -t "pwmfan" "not found cooling device"
++    if [ -d /sys/class/pwm ]; then
++        nohup /usr/bin/fa-fancontrol-direct.sh&
++    fi
++fi
++

devices/rockchip_armv8/patches/mt7922.patch

@@ -0,0 +1,38 @@
+--- a/package/kernel/mt76/Makefile
++++ b/package/kernel/mt76/Makefile
+@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
+   TITLE:=MediaTek MT7921 firmware
+ endef
+ 
++define KernelPackage/mt7922-firmware
++  $(KernelPackage/mt76-default)
++  DEPENDS+=+kmod-mt7921-common
++  TITLE:=MediaTek MT7922 firmware
++endef
++
+ define KernelPackage/mt7921-common
+   $(KernelPackage/mt76-default)
+   TITLE:=MediaTek MT7615 wireless driver common code
+@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
+ 		$(1)/lib/firmware/mediatek
+ endef
+ 
++define KernelPackage/mt7922-firmware/install
++	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
++	cp \
++		$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
++		$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
++		$(1)/lib/firmware/mediatek
++endef
++
+ define Package/mt76-test/install
+ 	mkdir -p $(1)/usr/sbin
+ 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
+@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
+ $(eval $(call KernelPackage,mt7916-firmware))
+ $(eval $(call KernelPackage,mt7986-firmware))
+ $(eval $(call KernelPackage,mt7921-firmware))
++$(eval $(call KernelPackage,mt7922-firmware))
+ $(eval $(call KernelPackage,mt7921-common))
+ $(eval $(call KernelPackage,mt7921u))
+ $(eval $(call KernelPackage,mt7921s))

devices/x86_64/diy.sh

@@ -14,12 +14,11 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
 
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
 
 svn co https://github.com/openwrt/openwrt/trunk/package/kernel/mt76 package/feeds/kiddin9/mt76
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/feeds/kiddin9/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
 
-svn co https://github.com/openwrt/openwrt/trunk/package/network/services/hostapd  package/feeds/kiddin9/hostapd
 
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk

devices/x86_64/patches/mt7922.patch

@@ -0,0 +1,38 @@
+--- a/package/kernel/mt76/Makefile
++++ b/package/kernel/mt76/Makefile
+@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
+   TITLE:=MediaTek MT7921 firmware
+ endef
+ 
++define KernelPackage/mt7922-firmware
++  $(KernelPackage/mt76-default)
++  DEPENDS+=+kmod-mt7921-common
++  TITLE:=MediaTek MT7922 firmware
++endef
++
+ define KernelPackage/mt7921-common
+   $(KernelPackage/mt76-default)
+   TITLE:=MediaTek MT7615 wireless driver common code
+@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
+ 		$(1)/lib/firmware/mediatek
+ endef
+ 
++define KernelPackage/mt7922-firmware/install
++	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
++	cp \
++		$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
++		$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
++		$(1)/lib/firmware/mediatek
++endef
++
+ define Package/mt76-test/install
+ 	mkdir -p $(1)/usr/sbin
+ 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
+@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
+ $(eval $(call KernelPackage,mt7916-firmware))
+ $(eval $(call KernelPackage,mt7986-firmware))
+ $(eval $(call KernelPackage,mt7921-firmware))
++$(eval $(call KernelPackage,mt7922-firmware))
+ $(eval $(call KernelPackage,mt7921-common))
+ $(eval $(call KernelPackage,mt7921u))
+ $(eval $(call KernelPackage,mt7921s))

devices/x86_generic/diy.sh

@@ -14,11 +14,9 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/ker
 svn co https://github.com/openwrt/openwrt/trunk/package/kernel/mt76 package/feeds/kiddin9/mt76
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/feeds/kiddin9/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
 
-svn co https://github.com/openwrt/openwrt/trunk/package/network/services/hostapd  package/feeds/kiddin9/hostapd
-
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/*.mk

devices/x86_generic/patches/mt7922.patch

@@ -0,0 +1,38 @@
+--- a/package/kernel/mt76/Makefile
++++ b/package/kernel/mt76/Makefile
+@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
+   TITLE:=MediaTek MT7921 firmware
+ endef
+ 
++define KernelPackage/mt7922-firmware
++  $(KernelPackage/mt76-default)
++  DEPENDS+=+kmod-mt7921-common
++  TITLE:=MediaTek MT7922 firmware
++endef
++
+ define KernelPackage/mt7921-common
+   $(KernelPackage/mt76-default)
+   TITLE:=MediaTek MT7615 wireless driver common code
+@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
+ 		$(1)/lib/firmware/mediatek
+ endef
+ 
++define KernelPackage/mt7922-firmware/install
++	$(INSTALL_DIR) $(1)/lib/firmware/mediatek
++	cp \
++		$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
++		$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
++		$(1)/lib/firmware/mediatek
++endef
++
+ define Package/mt76-test/install
+ 	mkdir -p $(1)/usr/sbin
+ 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
+@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
+ $(eval $(call KernelPackage,mt7916-firmware))
+ $(eval $(call KernelPackage,mt7986-firmware))
+ $(eval $(call KernelPackage,mt7921-firmware))
++$(eval $(call KernelPackage,mt7922-firmware))
+ $(eval $(call KernelPackage,mt7921-common))
+ $(eval $(call KernelPackage,mt7921u))
+ $(eval $(call KernelPackage,mt7921s))