update

.github/workflows/Openwrt-AutoBuild.yml

@@ -112,7 +112,7 @@ jobs:
             REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
                -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \
                -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v21 | tail -n 1 | sed -e 's/v//')"
-        git clone --depth 1 $REPO_URL -b v$REPO_BRANCH openwrt
+        git clone $REPO_URL -b v$REPO_BRANCH openwrt
         cd openwrt
         if [[ ${{matrix.target}} == "x86_64" ]]; then
             curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-$REPO_BRANCH-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/x86/64/openwrt-sdk-21.02-SNAPSHOT-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
@@ -211,11 +211,12 @@ jobs:
     - name: Organize files
       id: organize
       run: |
-        mkdir firmware
+        mkdir firmware kmods
         mv -f openwrt/bin/targets/*/*/{*combined*,*sysupgrade*} ./firmware/ 2>/dev/null || true
         cp openwrt/.config  ./firmware/${{matrix.target}}.config
         cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}_kernel.config
-        mv -f openwrt/bin/targets/*/*/packages ./kmods
+        kernel_v="$(cat openwrt/include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')"
+        mv -f openwrt/bin/targets/*/*/packages ./kmods/$kernel_v
         cd firmware
         echo "${{ env.VERSION }}.$(date +'%Y')" > version.txt
         rename -v "s/^openwrt/${{ env.VERSION }}-openwrt/" * || true
@@ -242,25 +243,16 @@ jobs:
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/firmware/${{matrix.target}}/"
 
-    - name: remote ssh command
-      uses: appleboy/ssh-action@master
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
-      with:
-        host: op.supes.top
-        username: root
-        key: ${{ env.SSH_PRIVATE_KEY }}
-        script: mkdir -p /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/${{ env.REPO_BRANCH }}
-
     - name: Deploy kmods to server
       uses: easingthemes/ssh-deploy@main
       if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
       with:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        ARGS: "-avzr --delete"
+        ARGS: "-avzr"
         SOURCE: kmods/
         REMOTE_HOST: op.supes.top
         REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/${{ env.REPO_BRANCH }}/"
+        TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/"
 
     - name: Upload firmware for artifact
       uses: actions/upload-artifact@main

.github/workflows/repo-dispatcher.yml

@@ -20,6 +20,10 @@ on:
         description: 'Skip version check'
         required: false
         default: 'true'
+      version:
+        description: 'Version'
+        required: false
+        default: ''
 
 env:
   REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
@@ -55,17 +59,17 @@ 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": "x86_64 ${{ env.SSH }}", "client_payload": {"target": "x86_64"}}'
+          -d '{"event_type": "x86_64 ${{ github.event.inputs.version }}", "client_payload": {"target": "x86_64"}}'
           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": "nanopi-r2s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r2s"}}'
+          -d '{"event_type": "nanopi-r2s ${{ github.event.inputs.version }}", "client_payload": {"target": "nanopi-r2s"}}'
           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": "nanopi-r4s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r4s"}}'
+          -d '{"event_type": "nanopi-r4s ${{ github.event.inputs.version }}", "client_payload": {"target": "nanopi-r4s"}}'
         else
           [ "$REPO_BRANCH" ] && exit 0;
           REPO_BRANCH_r=$(curl -s https://op.supes.top/firmware/x86_64/version.txt | tr "\r\n" "," | cut -f 3 -d ,)
@@ -77,17 +81,17 @@ 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": "x86_64 ${{ env.SSH }}", "client_payload": {"target": "x86_64"}}'
+              -d '{"event_type": "x86_64", "client_payload": {"target": "x86_64"}}'
               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": "nanopi-r2s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r2s"}}'
+              -d '{"event_type": "nanopi-r2s", "client_payload": {"target": "nanopi-r2s"}}'
               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": "nanopi-r4s ${{ env.SSH }}", "client_payload": {"target": "nanopi-r4s"}}'
+              -d '{"event_type": "nanopi-r4s", "client_payload": {"target": "nanopi-r4s"}}'
             fi
         fi
 

devices/Rpi-4B/diy.sh

@@ -24,4 +24,4 @@ CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm27xx/bcm2711/config-5.4
+' >> ./target/linux/bcm27xx/bcm2711/config-5.10

devices/common/.config

@@ -8,6 +8,8 @@ CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
 
 CONFIG_ALL_KMODS=y
+CONFIG_PACKAGE_kmod-rtl88x2bu=n
+
 # IPv6支持:
 CONFIG_IPV6=y
 
@@ -46,12 +48,6 @@ CONFIG_PACKAGE_luci-mod-rpc=y
 CONFIG_PACKAGE_luci-lib-ipkg=y
 CONFIG_PACKAGE_luci-lib-fs=y
 CONFIG_PACKAGE_luci-proto-relay=y
-CONFIG_PACKAGE_luci-app-turboacc=y
-CONFIG_PACKAGE_TURBOACC_INCLUDE_OFFLOADING=y
-CONFIG_PACKAGE_TURBOACC_INCLUDE_SHORTCUT_FE=y
-CONFIG_PACKAGE_TURBOACC_INCLUDE_BBR_CCA=y
-CONFIG_PACKAGE_TURBOACC_INCLUDE_DNSFORWARDER=n
-CONFIG_PACKAGE_TURBOACC_INCLUDE_DNSPROXY=n
 CONFIG_LUCI_LANG_zh_Hans=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_PACKAGE_coremark=y
@@ -77,6 +73,9 @@ CONFIG_PACKAGE_kmod-lib-lz4=y
 CONFIG_PACKAGE_zstd=y
 CONFIG_NODEJS_14=y
 
+CONFIG_PACKAGE_kmod-ipt-offload=y
+CONFIG_PACKAGE_kmod-tcp-bbr=y
+
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES=y

devices/common/default-settings

@@ -20,9 +20,9 @@ sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
 
 sed -i '/openwrt_kiddin9/d' /etc/opkg/distfeeds.conf
 sed -i 's?\(src/gz openwrt_\(core\|telephony\)\)?#\1?' /etc/opkg/distfeeds.conf
-VERSION="$(cat /etc/os-release | grep "VERSION=" | cut -d \" -f 2)"
+KERNEL_V="$(uname -r)"
 ARCH="$(cat /etc/os-release | grep "OPENWRT_ARCH=" | cut -d \" -f 2)"
-sed -i "\$a src/gz openwrt_kmods https://op.supes.top/packages/$ARCH/kmods/$VERSION" /etc/opkg/distfeeds.conf
+sed -i "\$a src/gz openwrt_kmods https://op.supes.top/packages/$ARCH/kmods/$KERNEL_V" /etc/opkg/distfeeds.conf
 sed -i "\$a src/gz openwrt_kiddin9 https://op.supes.top/packages/$ARCH" /etc/opkg/distfeeds.conf
 
 echo $(uci -q get uhttpd.main.index_page) | grep -q "cgi-bin/luci" ||
@@ -115,9 +115,8 @@ test $version -lt 1 && {
 	grep -q /etc/dnsmasq.d /etc/dnsmasq.conf ||
 		echo "conf-dir=/etc/dnsmasq.d" >> /etc/dnsmasq.conf
 
-	uci -q set turboacc.config.sw_flow='0'
-	uci -q set turboacc.config.sfe_flow='0'
-	uci commit turboacc
+	uci -q set firewall.@defaults[0].fullcone='1'
+	uci commit firewall
 
 	uci -q set fstab.@global[0].anon_mount=1
 	uci commit fstab
@@ -199,7 +198,6 @@ test $version -lt 1 && {
 SYSCTL_LOCAL=/etc/sysctl.d/50-local.conf
 mkdir -p /etc/sysctl.d
 echo -n >$SYSCTL_LOCAL
-
 echo net.nf_conntrack_max=$nf_conntrack_max >>$SYSCTL_LOCAL
 echo net.ipv4.ip_early_demux=0 >>$SYSCTL_LOCAL
 echo net.bridge.bridge-nf-call-iptables=0 >>$SYSCTL_LOCAL

devices/common/diy.sh

@@ -1,22 +1,36 @@
 #!/bin/bash
 #=================================================
 shopt -s extglob
+kernel_version="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include/kernel-version.mk | grep -o 'href=".*>kernel: bump 5.10' | head -1 | cut -d / -f 5 | cut -d "#" -f 1)"
+version="$(git rev-parse HEAD)"
+git checkout $kernel_version
+git checkout HEAD^
+mv -f target/linux package/kernel include/kernel-version.mk include/kernel-defaults.mk .github/
+git checkout $version
+rm -rf target/linux package/kernel include/kernel-version.mk include/kernel-defaults.mk
+mv -f .github/linux target/
+mv -f .github/kernel package/
+mv -f .github/kernel-version.mk .github/kernel-defaults.mk include/
+sed -i 's/ libelf//' tools/Makefile
+
 sed -i '/	refresh_config();/d' scripts/feeds
 [ ! -f feeds.conf ] && {
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
 }
+
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9
 ./scripts/feeds install -a
 cd feeds/kiddin9; git pull; cd -
+
 (
 svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/network/services/ppp package/network/services/ppp
 svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/network/services/dnsmasq package/network/services/dnsmasq
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/generic/hack-5.4 target/linux/generic/hack-5.4
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10
+rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*}
 curl -sfL https://git.io/J0klM --create-dirs -o package/network/config/firewall/patches/fullconenat.patch
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch -o target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch
 ) &
 
 sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile
@@ -25,6 +39,7 @@ sed -i 's/Os/O2/g' include/target.mk
 sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite/' package/Makefile
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
 sed -i '/root:/c\root:$1$tTPCBw1t$ldzfp37h5lSpO9VXk4uUE\/:18336:0:99999:7:::' package/base-files/files/etc/shadow
+sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
 sed -i -e '$a /etc/sysupgrade.conf' \
        -e '$a /etc/bench.log' \
        -e '/\/etc\/profile/d' \
@@ -62,6 +77,7 @@ if [ -f sdk.tar.xz ]; then
 	tar -xJf sdk.tar.xz -C sdk
 	cp -rf sdk/*/staging_dir/* ./staging_dir/
 	rm -rf sdk.tar.xz sdk
+	rm -rf `find "staging_dir/host/" -maxdepth 2 -name 'libelf*'` || true
 	sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
 	if [ -f /usr/bin/python ]; then
 		ln -sf /usr/bin/python staging_dir/host/bin/python

devices/common/diy/package/system/opkg/patches/zh-cn.patch

@@ -48,4 +48,12 @@
 +			 "软件包 %s 需要 %ld\n",
  			 kbs_available, root_dir, pkg->name, pkg_size_kbs);
  		return -1;
-
+@@ -1319,6 +1319,6 @@
+ 		}
+ 		if (err) {
+-			opkg_msg(ERROR, "Failed to download %s. "
+-				 "Perhaps you need to run 'opkg update'?\n",
++			opkg_msg(ERROR, "下载 %s 失败. "
++				 "请更新列表后重试\n",
+ 				 pkg->name);
+ 			return -1;

devices/common/patches/DRM-fix.patch

@@ -0,0 +1,11 @@
+--- a/package/kernel/linux/modules/video.mk
++++ b/package/kernel/linux/modules/video.mk
+@@ -225,7 +225,7 @@ define KernelPackage/drm
+   SUBMENU:=$(VIDEO_MENU)
+   TITLE:=Direct Rendering Manager (DRM) support
+   HIDDEN:=1
+-  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight
++  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +LINUX_5_10&&TARGET_x86_geode:kmod-backlight
+   KCONFIG:=CONFIG_DRM
+   FILES:= \
+ 	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \

devices/common/patches/add_Fullcone-NAT_option.patch

@@ -0,0 +1,11 @@
+--- a/package/feeds/luci/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
++++ b/package/feeds/luci/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+@@ -69,6 +69,8 @@ return view.extend({
+ 			p[i].value('ACCEPT', _('accept'));
+ 		}
+ 
++		o = s.option(form.Flag, 'fullcone', _('FullCone NAT'), _('Using FullCone NAT can improve gaming performance effectively'));
++		
+ 		/* Netfilter flow offload support */
+ 
+ 		if (L.hasSystemFeature('offloading')) {

devices/common/patches/ipvlan.patch

@@ -1,25 +0,0 @@
---- a/package/kernel/linux/modules/netdevices.mk
-+++ b/package/kernel/linux/modules/netdevices.mk
-@@ -885,6 +885,22 @@ endef
- $(eval $(call KernelPackage,macvlan))
- 
- 
-+define KernelPackage/ipvlan
-+  SUBMENU:=$(NETWORK_DEVICES_MENU)
-+  TITLE:=IP-VLAN support
-+  KCONFIG:=CONFIG_IPVLAN
-+  FILES:=$(LINUX_DIR)/drivers/net/ipvlan/ipvlan.ko
-+  AUTOLOAD:=$(call AutoProbe,ipvlan)
-+endef
-+
-+define KernelPackage/ipvlan/description
-+ A kernel module which allows one to create virtual interfaces that
-+ map packets to or from specific IP addresses to a particular interface
-+endef
-+
-+$(eval $(call KernelPackage,ipvlan))
-+
-+
- define KernelPackage/tulip
-   TITLE:=Tulip family network device support
-   DEPENDS:=@PCI_SUPPORT +kmod-mii

devices/common/patches/remove_firewall_view_offload.patch

@@ -1,20 +0,0 @@
---- a/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
-+++ b/feeds/luci/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
-@@ -70,7 +70,7 @@ return view.extend({
- 		}
- 
- 		/* Netfilter flow offload support */
--
-+/*
- 		if (L.hasSystemFeature('offloading')) {
- 			s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'),
- 				_('Experimental feature. Not fully compatible with QoS/SQM.'));
-@@ -89,7 +89,7 @@ return view.extend({
- 			o.optional = true;
- 			o.depends('flow_offloading', '1');
- 		}
--
-+*/
- 
- 		s = m.section(form.GridSection, 'zone', _('Zones'));
- 		s.addremove = true;

devices/common/patches/rule_MKHASH.patch

@@ -0,0 +1,11 @@
+--- a/rules.mk
++++ b/rules.mk
+@@ -266,6 +266,8 @@ TARGET_CXX:=$(TARGET_CROSS)g++
+ KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
+ SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
+ ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
++MKHASH:=$(STAGING_DIR_HOST)/bin/mkhash
++export MKHASH
+ CP:=cp -fpR
+ LN:=ln -sf
+ XARGS:=xargs -r

devices/common/patches/turboacc.patch

@@ -1,6 +1,16 @@
 --- a/package/feeds/kiddin9/luci-app-turboacc/Makefile
 +++ b/package/feeds/kiddin9/luci-app-turboacc/Makefile
-@@ -32,7 +32,6 @@ LUCI_DEPENDS:=+pdnsd-alt \
+@@ -20,8 +20,7 @@ PKG_CONFIG_DEPENDS:= \
+ 	
+ LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE
+ LUCI_PKGARCH:=all
+-LUCI_DEPENDS:=+pdnsd-alt \
+-	+PACKAGE_$(PKG_NAME)_INCLUDE_BBR_CCA:kmod-tcp-bbr \
++LUCI_DEPENDS:=+PACKAGE_$(PKG_NAME)_INCLUDE_BBR_CCA:kmod-tcp-bbr \
+ 	+PACKAGE_$(PKG_NAME)_INCLUDE_DNSFORWARDER:dnsforwarder \
+ 	+PACKAGE_$(PKG_NAME)_INCLUDE_DNSPROXY:dnsproxy \
+ 	+PACKAGE_$(PKG_NAME)_INCLUDE_OFFLOADING:kmod-ipt-offload \
+@@ -31,7 +30,6 @@ LUCI_DEPENDS:=+pdnsd-alt \
  define Package/$(PKG_NAME)/config
  config PACKAGE_$(PKG_NAME)_INCLUDE_OFFLOADING
  	bool "Include Flow Offload"

devices/nanopi-r2c/diy.sh

@@ -2,13 +2,14 @@
 
 shopt -s extglob
 rm -rf package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/uboot-rockchip package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.4)
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.4/.svn}
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip/patches-5.4 target/linux/rockchip/patches-5.4
-curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
+rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip
+rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
+rm -Rf target/linux/rockchip/patches-5.10/{006-*-NanoPi-R,007-*-R4S}.patch
+curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh --create-dirs -o files/usr/bin/fa-fancontrol.sh
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh --create-dirs -o files/usr/bin/fa-fancontrol-direct.sh
@@ -44,4 +45,4 @@ CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/rockchip/armv8/config-5.4
+' >> ./target/linux/rockchip/armv8/config-5.10

devices/nanopi-r2s/diy.sh

@@ -2,13 +2,14 @@
 
 shopt -s extglob
 rm -rf package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/uboot-rockchip package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.4)
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.4/.svn}
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip/patches-5.4 target/linux/rockchip/patches-5.4
-curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
+rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip
+rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
+rm -Rf target/linux/rockchip/patches-5.10/{006-*-NanoPi-R,007-*-R4S}.patch
+curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh --create-dirs -o files/usr/bin/fa-fancontrol.sh
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh --create-dirs -o files/usr/bin/fa-fancontrol-direct.sh
@@ -44,4 +45,4 @@ CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/rockchip/armv8/config-5.4
+' >> ./target/linux/rockchip/armv8/config-5.10

devices/nanopi-r4s/diy.sh

@@ -2,13 +2,14 @@
 
 shopt -s extglob
 rm -rf package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/uboot-rockchip package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.4)
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.4/.svn}
-svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/linux/rockchip/patches-5.4 target/linux/rockchip/patches-5.4
-curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip
+svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
+rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip
+rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
+svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
+rm -Rf target/linux/rockchip/patches-5.10/{006-*-NanoPi-R,007-*-R4S}.patch
+curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh --create-dirs -o files/usr/bin/fa-fancontrol.sh
 curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh --create-dirs -o files/usr/bin/fa-fancontrol-direct.sh
@@ -41,5 +42,5 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=y
 CONFIG_HW_RANDOM_ROCKCHIP=y
-' >> ./target/linux/rockchip/armv8/config-5.4
+' >> ./target/linux/rockchip/armv8/config-5.10
 

devices/x86_64/diy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.4 target/linux/x86/patches-5.4
-rm -rf target/linux/x86/patches-5.4/.svn
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.10 target/linux/x86/patches-5.10
+rm -rf target/linux/x86/patches-5.10/.svn
 
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 
@@ -10,7 +10,7 @@ CONFIG_CRYPTO_CHACHA20_X86_64=y
 CONFIG_CRYPTO_POLY1305_X86_64=y
 CONFIG_DRM=y
 CONFIG_DRM_I915=y
-' >> ./target/linux/x86/config-5.4
+' >> ./target/linux/x86/config-5.10
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config
 

onekey/build.sh

@@ -83,7 +83,7 @@ esac
 done
 
 REPO_BRANCH="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | jq -r '.[].name' | grep v21 | head -n 1 | sed -e 's/v//')"
-git clone -b v$REPO_BRANCH --depth 1 https://github.com/openwrt/openwrt
+git clone -b v$REPO_BRANCH https://github.com/openwrt/openwrt
 svn export https://github.com/kiddin9/OpenWrt_x86-r2s-r4s/trunk/devices openwrt/devices
 
 cd openwrt