From d5559e147e75a758b7847f6838c568b40ad4fc20 Mon Sep 17 00:00:00 2001 From: kiddin9 <48883331+kiddin9@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:56:05 +0800 Subject: [PATCH] update --- README.md | 6 ++-- devices/common/diy.sh | 2 +- devices/common/patches/imagebuilder.patch | 4 +-- devices/ramips_mt7621/.config | 6 ++++ devices/ramips_mt7621/diy.sh | 11 +++----- devices/ramips_mt7621/patches/0x50000.patch | 31 --------------------- devices/ramips_mt7621/patches/cr660x.patch | 21 ++++++++++++++ 7 files changed, 37 insertions(+), 44 deletions(-) delete mode 100644 devices/ramips_mt7621/patches/0x50000.patch diff --git a/README.md b/README.md index 40845ba50fca..8d409169d93c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -##### 在线定制专属固件: [supes.top](https://supes.top) +##### 一分钟在线编译定制专属固件: [supes.top](https://supes.top) #### 支持设备: -##### X86/64, 友善 NanoPi、R2S、R4S、R5S、R2C、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, DoorNet1, DoorNet2, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet MT1300、microuter-N300、MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米R3G-v2, 小米青春版Nano, 迅雷下载宝timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+ 等 +##### X86/64, 友善 NanoPi、R2S、R4S、R5S、R2C、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, DoorNet1, DoorNet2, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet MT1300、microuter-N300、MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米R3G-v2, 小米青春版Nano, 迅雷下载宝timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, JCG Q20, JCG Y2, 歌华链GHL-R-001, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+ 等 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg [2]: /LICENSE [3]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg @@ -30,7 +30,7 @@ + 自建插件仓库囊括了市面上几乎所有开源插件,插件库日更,系统自动更新所有已安装插件. -+ 在线一键定制固件,可在[supes.top](https://supes.top)在线定制专属定制, 同时支持github云编译和本地一键编译. ++ 通过[supes.top](https://supes.top)在线定制专属固件, 无需任何专业知识, 一分钟生成. 同时支持github云编译和本地一键编译. + 后台一键OTA更新固件,省去了每次固件升级都需要找固件,下载固件,上传固件等繁琐操作. diff --git a/devices/common/diy.sh b/devices/common/diy.sh index 2351ced2bc40..5c067854c4f1 100644 --- a/devices/common/diy.sh +++ b/devices/common/diy.sh @@ -8,7 +8,7 @@ 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 luci-lib-fs \ +luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \ coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server /" include/target.mk sed -i "s/procd-ujail//" include/target.mk diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch index 65cf62832d12..5cff9086fdc7 100644 --- a/devices/common/patches/imagebuilder.patch +++ b/devices/common/patches/imagebuilder.patch @@ -39,7 +39,7 @@ 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_asus_rt-ac1200|DEVICE_asus_rt-ac1200-v2|DEVICE_glinet_gl-mt300n-v2|DEVICE_glinet_microuter-n300|DEVICE_hiwifi_hc5661a|DEVICE_hiwifi_hc5761a|DEVICE_hiwifi_hc5861b|DEVICE_netgear_r6120|DEVICE_xiaomi_miwifi-nano) ]]; then \ ++ 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_asus_rt-ac1200|DEVICE_asus_rt-ac1200-v2|DEVICE_glinet_gl-mt300n-v2|DEVICE_glinet_microuter-n300|DEVICE_hiwifi_hc5661a|DEVICE_hiwifi_hc5761a|DEVICE_hiwifi_hc5861b|DEVICE_netgear_r6120|DEVICE_xiaomi_miwifi-nano|DEVICE_jcg_y2) ]]; 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; \ @@ -76,7 +76,7 @@ ) \ ) $(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_asus_rt-ac1200|DEVICE_asus_rt-ac1200-v2|DEVICE_glinet_gl-mt300n-v2|DEVICE_glinet_microuter-n300|DEVICE_hiwifi_hc5661a|DEVICE_hiwifi_hc5761a|DEVICE_hiwifi_hc5861b|DEVICE_netgear_r6120|DEVICE_xiaomi_miwifi-nano) ]]; then \ ++ 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_asus_rt-ac1200|DEVICE_asus_rt-ac1200-v2|DEVICE_glinet_gl-mt300n-v2|DEVICE_glinet_microuter-n300|DEVICE_hiwifi_hc5661a|DEVICE_hiwifi_hc5761a|DEVICE_hiwifi_hc5861b|DEVICE_netgear_r6120|DEVICE_xiaomi_miwifi-nano|DEVICE_jcg_y2) ]]; then \ + echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \ + fi diff --git a/devices/ramips_mt7621/.config b/devices/ramips_mt7621/.config index f30e365e2ce0..7a346d8f138d 100644 --- a/devices/ramips_mt7621/.config +++ b/devices/ramips_mt7621/.config @@ -21,9 +21,15 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6800=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6850=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6900-v2=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r7450=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_jcg_y2=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_jcg_q20=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_gehua_ghl-r-001=y CONFIG_PACKAGE_luci-ssl=y # uhttpd服务 +CONFIG_PACKAGE_kmod-shortcut-fe=n +CONFIG_PACKAGE_kmod-shortcut-fe-cm=n + CONFIG_PACKAGE_kmod-fs-ntfs3-oot=n diff --git a/devices/ramips_mt7621/diy.sh b/devices/ramips_mt7621/diy.sh index 7340055bd19d..3799e9c67997 100644 --- a/devices/ramips_mt7621/diy.sh +++ b/devices/ramips_mt7621/diy.sh @@ -2,12 +2,9 @@ shopt -s extglob -SHELL_FOLDER=$(dirname $(readlink -f "$0")) -#bash $SHELL_FOLDER/../common/kernel_5.15.sh +#rm -Rf target/linux/{ramips,generic} +#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/ramips target/linux/ramips +#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic target/linux/generic -#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 - -#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 - -#sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-natflow-users natflow-boot/' target/linux/ramips/Makefile +#curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/include/kernel-5.4 -o include/kernel-5.4 diff --git a/devices/ramips_mt7621/patches/0x50000.patch b/devices/ramips_mt7621/patches/0x50000.patch deleted file mode 100644 index 7b024a3ecc8f..000000000000 --- a/devices/ramips_mt7621/patches/0x50000.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts -+++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts -@@ -76,15 +76,9 @@ - }; - - partition@50000 { -- label = "permanent_config"; -- reg = <0x50000 0x50000>; -- read-only; -- }; -- -- partition@a0000 { - compatible = "denx,uimage"; - label = "firmware"; -- reg = <0xa0000 0xf60000>; -+ reg = <0x50000 0xfb0000>; - }; - }; - }; - ---- a/target/linux/ramips/image/mt7621.mk -+++ b/target/linux/ramips/image/mt7621.mk -@@ -1406,7 +1406,7 @@ TARGET_DEVICES += oraybox_x3a - - define Device/phicomm_k2p - $(Device/dsa-migration) -- IMAGE_SIZE := 15744k -+ IMAGE_SIZE := 16064k - DEVICE_VENDOR := Phicomm - DEVICE_MODEL := K2P - DEVICE_ALT0_VENDOR := Phicomm diff --git a/devices/ramips_mt7621/patches/cr660x.patch b/devices/ramips_mt7621/patches/cr660x.patch index eec7ce1e4303..885a3c6e7ec9 100644 --- a/devices/ramips_mt7621/patches/cr660x.patch +++ b/devices/ramips_mt7621/patches/cr660x.patch @@ -1,3 +1,15 @@ +From 593d238ebf777c36c9ee819a1e20f59da5adc361 Mon Sep 17 00:00:00 2001 +From: kiddin9 <48883331+kiddin9@users.noreply.github.com> +Date: Tue, 5 Jul 2022 17:54:53 +0800 +Subject: [PATCH] Update mt7621.mk + +Signed-off-by: kiddin9 <48883331+kiddin9@users.noreply.github.com> +--- + target/linux/ramips/image/mt7621.mk | 46 +++++++++-------------------- + 1 file changed, 14 insertions(+), 32 deletions(-) + +diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk +index bdaeac2cb16e..72fbd3930a80 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -223,7 +223,7 @@ define Device/asus_rt-n56u-b1 @@ -9,6 +21,15 @@ endef TARGET_DEVICES += asus_rt-n56u-b1 +@@ -984,7 +984,7 @@ define Device/jcg_y2 + JCG_MAXSIZE := 16064k + DEVICE_VENDOR := JCG + DEVICE_MODEL := Y2 +- DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 ++ DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server + endef + TARGET_DEVICES += jcg_y2 + @@ -1369,7 +1369,7 @@ define Device/netgear_wndr3700-v5 SERCOMM_SWVER := 0x1054 SERCOMM_PAD := 320k