From b6705cab42498defb1a3e211025f28f36bad8bda Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 04:23:39 +0800 Subject: [PATCH 1/9] Update X86_64.config --- X86_64.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X86_64.config b/X86_64.config index e2a5c848b345..26a13829ffae 100644 --- a/X86_64.config +++ b/X86_64.config @@ -100,7 +100,7 @@ CONFIG_PACKAGE_luci-app-noddos=n CONFIG_PACKAGE_luci-app-nps=n CONFIG_PACKAGE_luci-app-ntpc=n CONFIG_PACKAGE_luci-app-nut=n -CONFIG_PACKAGE_luci-app-oaf=n +CONFIG_PACKAGE_luci-app-oaf=y CONFIG_PACKAGE_luci-app-ocserv=n CONFIG_PACKAGE_luci-app-olsr=n CONFIG_PACKAGE_luci-app-olsr-services=n From 272b592132f231de105617fd7f72474764c40013 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 11:27:15 +0800 Subject: [PATCH 2/9] Update X86_64.config --- X86_64.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/X86_64.config b/X86_64.config index 26a13829ffae..e5ecbec1326d 100644 --- a/X86_64.config +++ b/X86_64.config @@ -238,9 +238,9 @@ CONFIG_PACKAGE_pdnsd-alt=y CONFIG_PACKAGE_ddns-scripts_aliyun=y CONFIG_PACKAGE_docker-ce=n CONFIG_V2RAY_COMPRESS_UPX=n -# CONFIG_DEVEL=y -# CONFIG_TOOLCHAINOPTS=y -# CONFIG_GCC_USE_VERSION_7=y +CONFIG_DEVEL=y +CONFIG_TOOLCHAINOPTS=y +CONFIG_GCC_USE_VERSION_9=y CONFIG_PACKAGE_ksmbd-utils=y CONFIG_PACKAGE_lm-sensors-detect=y CONFIG_PACKAGE_bc=y From f8939efea74ad581e63e72b679406bdc39c78e7b Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 11:32:51 +0800 Subject: [PATCH 3/9] Update X86_64.config --- X86_64.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X86_64.config b/X86_64.config index e5ecbec1326d..a0242c02bc3c 100644 --- a/X86_64.config +++ b/X86_64.config @@ -240,7 +240,7 @@ CONFIG_PACKAGE_docker-ce=n CONFIG_V2RAY_COMPRESS_UPX=n CONFIG_DEVEL=y CONFIG_TOOLCHAINOPTS=y -CONFIG_GCC_USE_VERSION_9=y +CONFIG_GCC_USE_VERSION_9=n CONFIG_PACKAGE_ksmbd-utils=y CONFIG_PACKAGE_lm-sensors-detect=y CONFIG_PACKAGE_bc=y From 6b23e572a0d0583bb8575a1f9db38e452557e1a9 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 12:43:07 +0800 Subject: [PATCH 4/9] Update diy.sh --- diy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diy.sh b/diy.sh index b21bcb6e097c..61e825e7266f 100755 --- a/diy.sh +++ b/diy.sh @@ -8,8 +8,6 @@ git clone https://github.com/jerrykuku/luci-theme-argon svn co https://github.com/openwrt/luci/trunk/applications/luci-app-acme git clone https://github.com/pymumu/luci-app-smartdns -b lede git clone https://github.com/lisaac/luci-app-diskman -git clone https://github.com/garypang13/openwrt-filerun -git clone https://github.com/garypang13/luci-app-baidupcs-web mkdir parted && cp luci-app-diskman/Parted.Makefile parted/Makefile git clone https://github.com/tty228/luci-app-serverchan git clone https://github.com/brvphoenix/luci-app-wrtbwmon @@ -34,6 +32,9 @@ svn co https://github.com/solidus1983/luci-theme-opentomato/trunk/luci/themes/lu git clone https://github.com/garypang13/openwrt-adguardhome git clone https://github.com/garypang13/luci-app-php-kodexplorer git clone https://github.com/garypang13/luci-app-eqos +git clone https://github.com/garypang13/openwrt-qbittorrent +git clone https://github.com/garypang13/openwrt-filerun +git clone https://github.com/garypang13/luci-app-baidupcs-web cd - echo -e "\q" | svn co https://github.com/coolsnowwolf/lede/trunk/package/lean feeds/custom/luci From c41d3148438b76260a38870d9639ab14a6a20289 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 20:24:33 +0800 Subject: [PATCH 5/9] Update diy.sh --- diy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diy.sh b/diy.sh index 61e825e7266f..ff0786e3a865 100755 --- a/diy.sh +++ b/diy.sh @@ -32,7 +32,7 @@ svn co https://github.com/solidus1983/luci-theme-opentomato/trunk/luci/themes/lu git clone https://github.com/garypang13/openwrt-adguardhome git clone https://github.com/garypang13/luci-app-php-kodexplorer git clone https://github.com/garypang13/luci-app-eqos -git clone https://github.com/garypang13/openwrt-qbittorrent +git clone https://github.com/garypang13/openwrt-qbittorrent && mv -f openwrt-qbittorrent/* ./ git clone https://github.com/garypang13/openwrt-filerun git clone https://github.com/garypang13/luci-app-baidupcs-web cd - From 75b4ca8be8097f9d34b1720c3bd11bb5af7cdc07 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 20:25:22 +0800 Subject: [PATCH 6/9] Update diy.sh --- diy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diy.sh b/diy.sh index ff0786e3a865..9a984ae8cd80 100755 --- a/diy.sh +++ b/diy.sh @@ -32,7 +32,7 @@ svn co https://github.com/solidus1983/luci-theme-opentomato/trunk/luci/themes/lu git clone https://github.com/garypang13/openwrt-adguardhome git clone https://github.com/garypang13/luci-app-php-kodexplorer git clone https://github.com/garypang13/luci-app-eqos -git clone https://github.com/garypang13/openwrt-qbittorrent && mv -f openwrt-qbittorrent/* ./ +git clone https://github.com/garypang13/openwrt-qbittorrent && mv -f openwrt-qbittorrent/* ./ git clone https://github.com/garypang13/openwrt-filerun git clone https://github.com/garypang13/luci-app-baidupcs-web cd - From 36369cdfa93762e09e1a09a9ce5d08255f8838e8 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 20:34:44 +0800 Subject: [PATCH 7/9] Update diy.sh --- diy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/diy.sh b/diy.sh index 9a984ae8cd80..a9a6b2b39881 100755 --- a/diy.sh +++ b/diy.sh @@ -43,6 +43,7 @@ cp -Rf ./diy/* ./ sed -i 's/..\/..\/luci.mk/$(TOPDIR)\/feeds\/luci\/luci.mk/g' package/feeds/custom/*/Makefile rm -Rf package/*/*/qBittorrent/patches +rm -Rf feeds/packages/libs/libdouble-conversion && svn co https://github.com/openwrt/packages/branches/openwrt-19.07/libs/libdouble-conversion feeds/packages/libs/libdouble-conversion rm -Rf feeds/packages/lang/php7 && svn co https://github.com/openwrt/packages/branches/openwrt-19.07/lang/php7 feeds/packages/lang/php7 rm -Rf files/usr/share/amule/webserver/AmuleWebUI-Reloaded && git clone https://github.com/MatteoRagni/AmuleWebUI-Reloaded files/usr/share/amule/webserver/AmuleWebUI-Reloaded rm -Rf files/usr/share/aria2 && git clone https://github.com/P3TERX/aria2.conf files/usr/share/aria2 From b274cb48927a7aafa5ec123e40ef2fb56166e145 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Wed, 27 May 2020 22:03:16 +0800 Subject: [PATCH 8/9] Rename qBittorrent.patch to qBittorrent.patch.b --- patches/{qBittorrent.patch => qBittorrent.patch.b} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{qBittorrent.patch => qBittorrent.patch.b} (100%) diff --git a/patches/qBittorrent.patch b/patches/qBittorrent.patch.b similarity index 100% rename from patches/qBittorrent.patch rename to patches/qBittorrent.patch.b From 8b57aded9d173f3ce17f82607f4000ec6b2650e7 Mon Sep 17 00:00:00 2001 From: garypang13 <48883331+garypang13@users.noreply.github.com> Date: Thu, 28 May 2020 02:43:29 +0800 Subject: [PATCH 9/9] Update diy.sh --- diy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diy.sh b/diy.sh index a9a6b2b39881..c91c0cad0174 100755 --- a/diy.sh +++ b/diy.sh @@ -38,12 +38,12 @@ git clone https://github.com/garypang13/luci-app-baidupcs-web cd - echo -e "\q" | svn co https://github.com/coolsnowwolf/lede/trunk/package/lean feeds/custom/luci +svn co https://github.com/openwrt/packages/branches/openwrt-19.07/libs/libdouble-conversion feeds/packages/libs/libdouble-conversion ./scripts/feeds update -a && ./scripts/feeds install -a cp -Rf ./diy/* ./ sed -i 's/..\/..\/luci.mk/$(TOPDIR)\/feeds\/luci\/luci.mk/g' package/feeds/custom/*/Makefile rm -Rf package/*/*/qBittorrent/patches -rm -Rf feeds/packages/libs/libdouble-conversion && svn co https://github.com/openwrt/packages/branches/openwrt-19.07/libs/libdouble-conversion feeds/packages/libs/libdouble-conversion rm -Rf feeds/packages/lang/php7 && svn co https://github.com/openwrt/packages/branches/openwrt-19.07/lang/php7 feeds/packages/lang/php7 rm -Rf files/usr/share/amule/webserver/AmuleWebUI-Reloaded && git clone https://github.com/MatteoRagni/AmuleWebUI-Reloaded files/usr/share/amule/webserver/AmuleWebUI-Reloaded rm -Rf files/usr/share/aria2 && git clone https://github.com/P3TERX/aria2.conf files/usr/share/aria2