update

kiddin9 · May 25, 2022 · 7b1296c · 7b1296c
1 parent 36c4be5
commit 7b1296c
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 84 deletions.
diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
@@ -48,6 +48,7 @@ jobs:
 
     - name: Load Settings.ini
       run: |
+        echo ${{matrix.target}}
         source "${GITHUB_WORKSPACE}/devices/common/settings.ini"
         if [ -f "devices/${{matrix.target}}/settings.ini" ]; then
           source "${GITHUB_WORKSPACE}/devices/${{matrix.target}}/settings.ini"
@@ -120,24 +121,6 @@ jobs:
                -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 v22 | tail -n 1 | sed -e 's/v//')"
         git clone $REPO_URL -b v$REPO_BRANCH openwrt
-        if [[ "${{ contains(github.event.action, 'nosdk') }}" != "true" ]]; then
-        cd openwrt
-        if [[ ${{matrix.target}} == "x86_64" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/x86/64/openwrt-sdk-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "rockchip_armv8" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/bcm27xx/bcm2711/openwrt-sdk-bcm27xx-bcm2711_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "armvirt_64" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/armvirt/64/openwrt-sdk-armvirt-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/ramips/mt7621/openwrt-sdk-ramips-mt7621_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "mediatek_mt7622" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/mediatek/mt7622/openwrt-sdk-mediatek-mt7622_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        elif [[ ${{matrix.target}} == "ipq807x" ]]; then
-            curl -fL -m 60 -o sdk.tar.xz https://op.supes.top/releases/targets/ipq807x/generic/openwrt-sdk-ipq807x-generic_gcc-11.2.0_musl.Linux-x86_64.tar.xz || true
-        fi
-        fi
         ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
         echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV
         echo "$REPO_BRANCH"
@@ -197,16 +180,21 @@ jobs:
         make download -j$(($(nproc)+1)) &
         sleep 5
 
+    - name: Cache
+      uses: klever1988/cachewrtbuild@main
+      with:
+        ccache: 'true'
+        clean: ${{ contains(github.event.action, 'nocache') }}
+        prefix: ${{ github.workspace }}/openwrt
+
     - name: Compile the firmware
       id: compile
       run: |
         cd openwrt
         echo -e "$(($(nproc)+1)) thread compile"
         make -j$(($(nproc)+1)) || (curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" ; make -j1 V=s)
         sed -i "s/# CONFIG_IB is not set/CONFIG_IB=y/" .config
-        make defconfig
-        make target/imagebuilder/compile -j$(($(nproc)+1))
-        make checksum V=s
+        rm -rf staging_dir/toolchain-*/bin/*openwrt-linux-musl-lto-dump
    
     - name: Check space usage
       run: df -hT
@@ -219,6 +207,7 @@ jobs:
         mkdir -p firmware/${{matrix.target}}
         cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
         cd openwrt/bin/targets/*/*/
+        mv -f profiles.json profiles.json.b
         cp $GITHUB_WORKSPACE/openwrt/.config ${{matrix.target}}.config || true
         cp $GITHUB_WORKSPACE/openwrt/build_dir/target-*/linux-*/linux-*/.config ${{matrix.target}}_kernel.config || true
         mv -f packages ${{ env.KERNEL }}

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 <a href="https://t.me/opwrts" target="_blank">Telegram</a>
 ## 1. **特色**
 
-+ Cutting edge,openwrt官方openwrt-21.02分支版本, Kernel 5.15, 与官方最新源码同步.
++ Cutting edge,openwrt官方openwrt-21.02分支版本, Kernel 5.10, 与官方最新源码同步.
 
 + 原生极致纯净,固件默认只包含基础上网功能, 后台在线选装插件,系统升级不丢失插件和配置.
 

diff --git a/devices/armvirt_64/.config b/devices/armvirt_64/.config
@@ -10,4 +10,3 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_TESTING_KERNEL=y
diff --git a/devices/armvirt_64/diy.sh b/devices/armvirt_64/diy.sh
@@ -1,4 +1,9 @@
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile
+
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

diff --git a/devices/bcm27xx_bcm2711/diy.sh b/devices/bcm27xx_bcm2711/diy.sh
@@ -1,13 +1,6 @@
 #!/bin/bash
 
-kernel_v="$(cat include/kernel-5.10 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
-echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
-sed -i "s?packages/%A/kmods/.*'?packages/%A/kmods/$kernel_v'?" include/feeds.mk
-
-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*,780-drivers-net*}
-
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile
 
 sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile
 

diff --git a/devices/common/.config b/devices/common/.config
@@ -12,17 +12,14 @@ CONFIG_SIGNATURE_CHECK=n
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
-CONFIG_TESTING_KERNEL=y
-
 CONFIG_ALL_KMODS=y
-CONFIG_PACKAGE_kmod-ipt-coova=n
-CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
-
-CONFIG_SDK=y
 
+CONFIG_IB=y
 CONFIG_IB_STANDALONE=y
 CONFIG_JSON_OVERVIEW_IMAGE_INFO=y
 
+CONFIG_SDK=y
+
 CONFIG_FEED_telephony=n
 
 # IPv6支持:
@@ -68,7 +65,6 @@ CONFIG_PACKAGE_iptables-mod-fullconenat=y
 CONFIG_XRAY_PROVIDE_V2RAY=y
 CONFIG_V2RAY_CORE_COMPRESS_UPX=n
 CONFIG_XRAY_CORE_COMPRESS_UPX=n
-CONFIG_PACKAGE_fdisk=y
 CONFIG_PACKAGE_zram-swap=y
 CONFIG_PACKAGE_kmod-lib-lz4=y
 CONFIG_PACKAGE_kmod-lib-zstd=y

diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -1,28 +1,17 @@
 #!/bin/bash
 #=================================================
 shopt -s extglob
-rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} tools/firmware-utils
-latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
-mkdir new; cp -rf .git new/.git
-cd new
-[ "$latest" ] && git reset --hard $latest || (git checkout master && git reset --hard HEAD)
-git checkout HEAD^
-[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
-cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} tools/firmware-utils package/utils/ucode ../
-cd -
-
-kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+kernel_v="$(cat include/kernel-5.10 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
 echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
 sed -i "s?targets/%S/packages?targets/%S/$kernel_v?" include/feeds.mk
+
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
 luci-app-wizard luci-app-attendedsysupgrade luci-base luci-compat luci-lib-ipkg \
 coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash /" include/target.mk
 sed -i "s/procd-ujail//" include/target.mk
 
-sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
-
 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
@@ -36,22 +25,21 @@ rm -rf package/{base-files,network/config/firewall,network/config/firewall4,netw
 cd feeds/kiddin9; git pull; cd -
 
 mv -f feeds/kiddin9/r81* tmp/
-svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel
+
 sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate
-rm -f package/feeds/packages/libpfring; svn export https://github.com/openwrt/packages/trunk/libs/libpfring package/feeds/kiddin9/libpfring
-rm -f package/feeds/packages/xtables-addons; svn export https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons
 
 (
 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/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
-rm -rf target/linux/generic/hack-5.15/{220-gc_sections*,781-dsa-register*,780-drivers-net*}
+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*,780-drivers-net*}
+curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 ) &
 
 sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile
 sed -i 's/\/cgi-bin\/\(luci\|cgi-\)/\/\1/g' `find package/feeds/kiddin9/luci-*/ -name "*.lua" -or -name "*.htm*" -or -name "*.js"` &
 sed -i 's/Os/O2/g' include/target.mk
-sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-maintainer/' package/Makefile
+sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-maintainer --force-depends/' package/Makefile
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
 sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
 
@@ -79,7 +67,6 @@ 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

diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
+latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
+mkdir new; cp -rf .git new/.git
+cd new
+[ "$latest" ] && git reset --hard $latest || git reset --hard origin/master
+git checkout HEAD^
+[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
+cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
+cd -
+
+kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
+sed -i "s?targets/%S/packages?targets/%S/$kernel_v?" include/feeds.mk
+
+sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
+svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel
+svn export --force  https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons
+
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
+rm -rf target/linux/generic/hack-5.15/{220-gc_sections*,781-dsa-register*,780-drivers-net*}
+
+echo "
+CONFIG_TESTING_KERNEL=y
+CONFIG_PACKAGE_kmod-ipt-coova=n
+CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
+" >> devices/common/.config
diff --git a/devices/common/patches/video.patch b/devices/common/patches/video.patch
@@ -1,17 +1,17 @@
-From 03a1613c1e95b042dd99a6f69c45b61d786e41d4 Mon Sep 17 00:00:00 2001
+From d990f23c514708418a2222cfd20dcc3478f9a522 Mon Sep 17 00:00:00 2001
 From: kiddin9 <[email protected]>
-Date: Sat, 23 Apr 2022 18:52:48 +0800
+Date: Mon, 23 May 2022 14:55:01 +0800
 Subject: [PATCH] Update video.mk
 
 ---
  package/kernel/linux/modules/video.mk | 63 +++++++++++++++++++++++++--
  1 file changed, 59 insertions(+), 4 deletions(-)
 
 diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
-index 258414df4509..3056d1d4d947 100644
+index 2a306b5f4289..0a759dd0ebcd 100644
 --- a/package/kernel/linux/modules/video.mk
 +++ b/package/kernel/linux/modules/video.mk
-@@ -220,14 +220,36 @@ endef
+@@ -220,13 +220,35 @@ endef
 
  $(eval $(call KernelPackage,fb-tft-ili9486))
 
@@ -37,10 +37,9 @@ index 258414df4509..3056d1d4d947 100644
    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 +kmod-i2c-algo-bit +!TARGET_x86&&PACKAGE_kmod-backlight:kmod-backlight \
- 	+(LINUX_5_15):kmod-fb
+-  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight
 -  KCONFIG:=CONFIG_DRM
++ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight
 +  KCONFIG:=	\
 +	CONFIG_DRM	\
 +	CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y	\
@@ -50,7 +49,7 @@ index 258414df4509..3056d1d4d947 100644
    FILES:= \
  	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
  	$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
-@@ -301,8 +323,6 @@ define KernelPackage/drm-imx
+@@ -300,8 +322,6 @@ define KernelPackage/drm-imx
    TITLE:=Freescale i.MX DRM support
    DEPENDS:=@TARGET_imx +kmod-drm-kms-helper
    KCONFIG:=CONFIG_DRM_IMX \
@@ -59,7 +58,7 @@ index 258414df4509..3056d1d4d947 100644
  	CONFIG_IMX_IPUV3_CORE \
  	CONFIG_RESET_CONTROLLER=y \
  	CONFIG_DRM_IMX_IPUV3 \
-@@ -1030,3 +1050,38 @@ define KernelPackage/video-gspca-konica/description
+@@ -1028,3 +1048,38 @@ define KernelPackage/video-gspca-konica/description
  endef
 
  $(eval $(call KernelPackage,video-gspca-konica))

diff --git a/devices/ipq807x/diy.sh b/devices/ipq807x/diy.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
-
 shopt -s extglob
 
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
 rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
@@ -11,7 +13,6 @@ svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel package/kernel
 
-
 rm -rf target/linux/generic target/linux/ipq807x/!(patches-5.15)
 svn export --force https://github.com/Boos4721/openwrt/trunk/target/linux/generic target/linux/generic
 rm -rf target/linux/generic/hack-5.15/531-debloat_lzma.patch target/linux/generic/hack-5.15/600-bridge_offload.patch

diff --git a/devices/mediatek_mt7622/diy.sh b/devices/mediatek_mt7622/diy.sh
@@ -2,7 +2,7 @@
 
 shopt -s extglob
 
-curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch
+curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/mediatek/patches-5.10/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/mediatek/patches-5.10/995-0001-hwnat-add-natflow-flow-offload-support.patch
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-natflow-users natflow-boot/' target/linux/mediatek/Makefile
 
@@ -30,4 +30,4 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/mediatek/mt7622/config-5.15
+' >> ./target/linux/mediatek/mt7622/config-5.10
diff --git a/devices/ramips_mt7621/.config b/devices/ramips_mt7621/.config
@@ -12,6 +12,8 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-ac2100=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_d-team_newifi-d2=y
 
+CONFIG_PACKAGE_kmod-fs-ntfs3-oot=n
+
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 
diff --git a/devices/ramips_mt7621/diy.sh b/devices/ramips_mt7621/diy.sh
@@ -2,7 +2,7 @@
 
 shopt -s extglob
 
-curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/ramips/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch
+curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/ramips/patches-5.10/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/ramips/patches-5.10/995-0001-hwnat-add-natflow-flow-offload-support.patch
 
 svn export --force https://github.com/x-wrt/x-wrt/trunk/target/linux/ramips/files/drivers/net/ethernet/ralink target/linux/ramips/files/drivers/net/ethernet/ralink
 

diff --git a/devices/ramips_mt7621/patches/cr660x.patch b/devices/ramips_mt7621/patches/cr660x.patch
@@ -1,22 +1,22 @@
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@@ -1847,7 +1847,6 @@ define Device/xiaomi_nand_separate
+@@ -1843,7 +1843,6 @@ define Device/xiaomi_nand_separate
    PAGESIZE := 2048
    KERNEL_SIZE := 4096k
    UBINIZE_OPTS := -E 5
 -  IMAGES += kernel1.bin rootfs0.bin
    IMAGE/kernel1.bin := append-kernel
    IMAGE/rootfs0.bin := append-ubi | check-size
    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-@@ -1885,7 +1884,6 @@ define Device/xiaomi_mi-router-3-pro
+@@ -1881,7 +1880,6 @@ define Device/xiaomi_mi-router-3-pro
    IMAGE_SIZE := 255488k
    DEVICE_VENDOR := Xiaomi
    DEVICE_MODEL := Mi Router 3 Pro
 -  IMAGES += factory.bin
    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
    IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
  	check-size
-@@ -1931,30 +1929,14 @@ define Device/xiaomi_mi-router-cr660x
+@@ -1927,30 +1925,14 @@ define Device/xiaomi_mi-router-cr660x
    KERNEL_SIZE := 4096k
    UBINIZE_OPTS := -E 5
    IMAGE_SIZE := 128512k