update

kiddin9 · May 28, 2023 · 7d7f735 · 7d7f735
1 parent af7fa86
commit 7d7f735
Show file tree

Hide file tree

Showing 59 changed files with 836 additions and 4,369 deletions.
diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
@@ -119,7 +119,7 @@ jobs:
       run: |
         sudo -E apt-get -qq update
         sudo -E apt-get -qq install build-essential clang flex g++ gawk gcc-multilib gettext \
-        git libncurses5-dev libssl-dev python3-distutils python3-pyelftools libpython3-dev rsync unzip zlib1g-dev swig aria2 jq subversion qemu-utils ccache rename libelf-dev device-tree-compiler libgnutls28-dev
+        git libncurses5-dev libssl-dev python3-distutils python3-pyelftools libpython3-dev rsync unzip zlib1g-dev swig aria2 jq subversion qemu-utils ccache rename libelf-dev device-tree-compiler libgnutls28-dev coccinelle
         sudo -E apt-get -qq purge azure-cli ghc* zulu* llvm* firefox powershell openjdk* dotnet* google* mysql* php* android*
         sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq autoremove --purge

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、R5C、R6S、NEO3, 斐讯
 <a href="https://t.me/opwrt" target="_blank">TG通知频道</a>
 ## 1. **特色**
 
-+ Cutting edge,openwrt官方openwrt-22.03分支版本, Kernel 5.15, 与官方最新源码同步.
++ Cutting edge,openwrt官方openwrt-23.05分支版本, Kernel 5.15, 与官方最新源码同步.
 
 + 原生极致纯净,固件默认只包含基础上网功能, 后台在线选装插件,系统升级不丢失插件和配置.
 

diff --git a/devices/armvirt_64/diy.sh b/devices/armvirt_64/diy.sh
@@ -1,10 +1,9 @@
 
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk/' target/linux/armvirt/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk/' target/linux/armvirt/Makefile
 
 
diff --git a/devices/ath79_nand/diy.sh b/devices/ath79_nand/diy.sh
@@ -3,7 +3,7 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-#bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
 
 
 

diff --git a/devices/bcm27xx_bcm2708/diy.sh b/devices/bcm27xx_bcm2708/diy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-#bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
 

diff --git a/devices/bcm27xx_bcm2709/diy.sh b/devices/bcm27xx_bcm2709/diy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-#bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
 

diff --git a/devices/bcm27xx_bcm2710/diy.sh b/devices/bcm27xx_bcm2710/diy.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 
 

diff --git a/devices/bcm27xx_bcm2711/diy.sh b/devices/bcm27xx_bcm2711/diy.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 
 

diff --git a/devices/bcm53xx/diy.sh b/devices/bcm53xx/diy.sh
@@ -3,7 +3,7 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-#bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
 
 sed -i "s/^TARGET_DEVICES /# TARGET_DEVICES /" target/linux/bcm53xx/image/Makefile
 sed -i "s/# TARGET_DEVICES += phicomm_k3/TARGET_DEVICES += phicomm_k3/" target/linux/bcm53xx/image/Makefile

diff --git a/devices/common/.config b/devices/common/.config
@@ -79,7 +79,17 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_PACKAGE_bash=y
 CONFIG_PACKAGE_ca-bundle=y
 
-CONFIG_PACKAGE_dockerd=m
+CONFIG_KERNEL_CGROUP_DEVICE=y
+CONFIG_KERNEL_CGROUP_FREEZER=y
+CONFIG_KERNEL_NET_CLS_CGROUP=y
+CONFIG_KERNEL_CGROUP_NET_PRIO=y
+CONFIG_KERNEL_MEMCG_SWAP_ENABLED=y
+CONFIG_KERNEL_CFQ_GROUP_IOSCHED=y
+CONFIG_KERNEL_CGROUP_PERF=y
+CONFIG_KERNEL_CGROUP_HUGETLB=y
+CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
+CONFIG_KERNEL_EXT4_FS_SECURITY=y
+CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
 
 CONFIG_PACKAGE_kmod-drm-nouveau=n
 CONFIG_PACKAGE_kmod-rtl8821cu=n
@@ -98,7 +108,7 @@ CONFIG_PACKAGE_kmod-mii=n
 
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_REPO="https://op.supes.top"
+CONFIG_VERSION_REPO="https://op.supes.top/23.05"
 CONFIG_VERSION_MANUFACTURER="Kiddin'"
 CONFIG_VERSION_FILENAMES=n
 CONFIG_VERSION_CODE_FILENAMES=n
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -4,6 +4,7 @@ shopt -s extglob
 
 [ ! -f feeds.conf ] && {
 sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
+sed -i "/telephony/d" feeds.conf.default
 }
 
 sed -i "s?targets/%S/packages?targets/%S/\$(LINUX_VERSION)?" include/feeds.mk
@@ -41,6 +42,13 @@ sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 (
 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*,996-fs-ntfs3*,100-update-mtk_wed_h.patch}
+
+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/{799-v6.0-net-mii*,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/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch

diff --git a/devices/common/feeds.conf b/devices/common/feeds.conf
diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh
diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch
@@ -13,8 +13,8 @@
  	$(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/^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\/\2/' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) '/openwrt_core/d' $(PKG_BUILD_DIR)/repositories.conf
 

diff --git a/devices/common/settings.ini b/devices/common/settings.ini
@@ -1,5 +1,5 @@
 REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH=""
+REPO_BRANCH="openwrt-23.05"
 CONFIG_FILE=".config"
 DIY_SH="diy.sh"
 FREE_UP_DISK="false"

diff --git a/devices/ipq40xx_generic/diy.sh b/devices/ipq40xx_generic/diy.sh
@@ -4,8 +4,6 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
-
 
 
 svn export --force https://github.com/openwrt/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi

diff --git a/devices/ipq50xx_arm/.config b/devices/ipq50xx_arm/.config
@@ -6,8 +6,6 @@ CONFIG_TARGET_ALL_PROFILES=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
-CONFIG_PACKAGE_kmod-mdio-netlink=n
-CONFIG_PACKAGE_kmod-jool-netfilter=n
 CONFIG_PACKAGE_perf=n
 
 CONFIG_PACKAGE_kmod-netem=n

diff --git a/devices/ipq50xx_arm/diy.sh b/devices/ipq50xx_arm/diy.sh
@@ -4,18 +4,13 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i '/postgres=5432/d' feeds/packages.index
-sed -i '/postgres=5432/d' feeds/packages/net/gnunet/Makefile
-./scripts/feeds install -a
-
-sed -i "s/make-ext4fs missing-macros/make-ext4fs meson missing-macros/" tools/Makefile
-curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/include/meson.mk -o include/meson.mk
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/tools/meson tools/meson
-
 rm -rf package/feeds/kiddin9/rtl* feeds/kiddin9/{shortcut-fe,fullconenat-nft} package/kernel/mt76 package/kernel/exfat package/feeds/packages/fuse*
 
 rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
-rm -rf toolchain/musl
+rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
 
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
+ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/ipq50xx_arm/feeds.conf b/devices/ipq50xx_arm/feeds.conf
@@ -1,4 +1,4 @@
-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 packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
+src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
diff --git a/devices/ipq60xx_generic/.config b/devices/ipq60xx_generic/.config
@@ -8,7 +8,7 @@ CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=n
 
 CONFIG_TARGET_ROOTFS_INITRAMFS=n
 
-CONFIG_PACKAGE_dockerd=n
+CONFIG_PACKAGE_perf=n
 
 CONFIG_GCC_USE_VERSION_7=y
 CONFIG_PACKAGE_kmod-dm-raid=n
@@ -56,6 +56,8 @@ CONFIG_PACKAGE_kmod-batman-adv=n
 CONFIG_PACKAGE_kmod-rtl8812au-ct=n
 CONFIG_PACKAGE_kmod-rtl8821cu=n
 CONFIG_PACKAGE_kmod-rtl88x2bu=n
+CONFIG_PACKAGE_kmod-pf-ring=n
+CONFIG_PACKAGE_kmod-netatop=n
 
 
 CONFIG_SECCOMP=n

diff --git a/devices/ipq60xx_generic/diy.sh b/devices/ipq60xx_generic/diy.sh
@@ -21,9 +21,14 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/maste
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/quilt.mk -o include/quilt.mk
 
 rm -rf toolchain/.svn
-rm -rf feeds/kiddin9/{rtl*,fullconenat-nft,shortcut-fe,netifd} package/kernel/mt76 toolchain/musl package/feeds/packages/{xtables-addons,openvswitch}
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/glibc toolchain/glibc
+rm -rf feeds/kiddin9/{rtl*,fullconenat-nft,shortcut-fe,netifd} package/kernel/mt76 toolchain/musl package/feeds/packages/{xtables-addons,openvswitch} package/libs/elfutils package/utils/util-linux package/feeds/luci/ucode-mod-html package/libs/openssl package/network/utils/iptables package/feeds/packages/v4l2loopback package/feeds/packages/jool package/network/utils/uqmi
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/glibc toolchain/glibc
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/libs/elfutils package/libs/elfutils
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/utils/util-linux package/utils/util-linux
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/libs/openssl package/libs/openssl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/network/utils/iptables package/network/utils/iptables
+svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/network/utils/uqmi package/network/utils/uqmi
 
 sed -i "s/5.4.0/4.4.0/" toolchain/glibc/common.mk
 

diff --git a/devices/ipq60xx_generic/patches/fix.patch b/devices/ipq60xx_generic/patches/fix.patch
@@ -92,7 +92,7 @@
  	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
  	kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-ssdk \
 -	kmod-ath11k-ahb qca-ssdk-shell wpad-openssl \
-+	kmod-ath11k-ahb qca-ssdk-shell wpad-basic-wolfssl \
++	kmod-ath11k-ahb qca-ssdk-shell wpad-basic-mbedtls \
  	ath11k-firmware-ipq6018 nss-firmware-ipq6018 \
  	kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm uboot-envtools
 

diff --git a/devices/ipq807x_generic/README.md b/devices/ipq807x_generic/README.md
diff --git a/devices/ipq807x_generic/diy.sh b/devices/ipq807x_generic/diy.sh
@@ -3,8 +3,6 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
-
 svn co https://github.com/robimarko/nss-packages/trunk/qca/qca-ssdk-shell package/network/utils/qca-ssdk-shell
 
 sh -c "curl -sfL https://github.com/robimarko/openwrt/commit/23fa931934151f72c1655ffa62ff1a979575f07e.patch | patch -d './' -p1 --forward"

diff --git a/devices/ipq807x_generic/feeds.conf b/devices/ipq807x_generic/feeds.conf
diff --git a/devices/ipq807x_generic/settings.ini b/devices/ipq807x_generic/settings.ini
diff --git a/devices/ipq807x_ipq60xx/.config b/devices/ipq807x_ipq60xx/.config
@@ -7,10 +7,7 @@ CONFIG_TARGET_DEVICE_ipq807x_ipq60xx_DEVICE_glinet_ax1800=y
 
 CONFIG_CCACHE=n
 
-CONFIG_PACKAGE_dockerd=n
-CONFIG_PACKAGE_kmod-mdio-netlink=n
-CONFIG_PACKAGE_kmod-jool-netfilter=n
-CONFIG_PACKAGE_kmod-ovpn-dco=n
+CONFIG_PACKAGE_perf=n
 
 CONFIG_PACKAGE_kmod-dm-raid=n
 CONFIG_PACKAGE_kmod-dm=n

diff --git a/devices/ipq807x_ipq60xx/diy.sh b/devices/ipq807x_ipq60xx/diy.sh
@@ -12,13 +12,9 @@ rm -rf package/feeds
 ./scripts/feeds install -a -p wifi_ax -f
 ./scripts/feeds install -a -p gl_feeds_common -f
 ./scripts/feeds install -a -p kiddin9 -f
-sed -i '/postgres=5432/d' feeds/packages.index
-sed -i '/postgres=5432/d' feeds/packages/net/gnunet/Makefile
 ./scripts/feeds install -a
 
-sed -i "s/make-ext4fs missing-macros/make-ext4fs meson missing-macros/" tools/Makefile
-curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/include/meson.mk -o include/meson.mk
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/tools/meson tools/meson
+sed -i "/CONFIG_KERNEL_/d" devices/common/.config
 
 echo "
 CONFIG_FEED_gl_feeds_common=n
@@ -39,6 +35,9 @@ rm -rf package/kernel/exfat
 
 rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}
 
-rm -rf toolchain/musl
+rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
 
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
+ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
diff --git a/devices/ipq807x_ipq60xx/feeds.conf b/devices/ipq807x_ipq60xx/feeds.conf
@@ -1,6 +1,6 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-22.03
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
 src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-22.03
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
 src-git gl_feeds_common https://github.com/gl-inet/gl-feeds.git;common
 src-link ipq807x ../../feeds/ipq807x

diff --git a/devices/kirkwood_generic/diy.sh b/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
+
 
 
diff --git a/devices/mediatek_filogic/.config b/devices/mediatek_filogic/.config
@@ -7,5 +7,5 @@ CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_bananapi_bpi-r3=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_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-mt3000=y
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
diff --git a/devices/mediatek_filogic/diy.sh b/devices/mediatek_filogic/diy.sh
@@ -2,10 +2,4 @@
 
 shopt -s extglob
 
-SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
-
-rm -rf tools/mkimage
-svn co https://github.com/openwrt/openwrt/trunk/tools/mkimage tools/mkimage
-
-curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/master/scripts/mkits.sh -o scripts/mkits.sh
+sh -c "curl -sfL https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/11115.patch | patch -d './' -p1 --forward"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,7 @@
		shopt -s extglob

		SHELL_FOLDER=$(dirname $(readlink -f "$0"))
		#bash $SHELL_FOLDER/../common/kernel_5.15.sh




Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,8 +4,6 @@ shopt -s extglob

		SHELL_FOLDER=$(dirname $(readlink -f "$0"))

		bash $SHELL_FOLDER/../common/kernel_5.15.sh



		svn export --force https://github.com/openwrt/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,6 @@
		shopt -s extglob

		SHELL_FOLDER=$(dirname $(readlink -f "$0"))
		#bash $SHELL_FOLDER/../common/kernel_5.15.sh