From fa2b41d576402a977e4b50ebdb8f7b416a6265aa Mon Sep 17 00:00:00 2001 From: remittor Date: Tue, 6 Aug 2024 16:40:50 +0300 Subject: [PATCH] Add ruantiblock modules Source: https://github.com/gSpotx2f/ruantiblock_openwrt --- _addons.config | 4 ++++ _base.config | 2 +- _vpn.config | 5 +++++ xmake.sh | 7 +++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/_addons.config b/_addons.config index 591acfa..61ef709 100644 --- a/_addons.config +++ b/_addons.config @@ -51,3 +51,7 @@ CONFIG_FEED__alpine_fan_control=m #GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git CONFIG_FEED__amneziawg=m +### ruantiblock +#GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git +CONFIG_FEED__ruantiblock=m + diff --git a/_base.config b/_base.config index 003e4e7..069ab01 100644 --- a/_base.config +++ b/_base.config @@ -238,4 +238,4 @@ CONFIG_PACKAGE_luci-i18n-nlbwmon-ru=y #DISABLED_SVC=xray_core #DISABLED_SVC=xray #DISABLED_SVC=https-dns-proxy - +#DISABLED_SVC=ruantiblock diff --git a/_vpn.config b/_vpn.config index 382bfa5..0e7ad59 100644 --- a/_vpn.config +++ b/_vpn.config @@ -33,3 +33,8 @@ CONFIG_PACKAGE_kmod-nft-tproxy=y #CONFIG_PACKAGE_luci-app-xray=y #CONFIG_PACKAGE_v2ray-geoip=y #CONFIG_PACKAGE_v2ray-geosite=y + +CONFIG_PACKAGE_ruantiblock=y +CONFIG_PACKAGE_luci-app-ruantiblock=y +CONFIG_PACKAGE_ruantiblock-mod-lua=y +CONFIG_PACKAGE_ruantiblock-mod-py=y diff --git a/xmake.sh b/xmake.sh index 490468a..3d0c6a5 100755 --- a/xmake.sh +++ b/xmake.sh @@ -116,6 +116,13 @@ function build_target { sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7622.mk sed -i 's/ squashfs-sys/ sys/g' $XDIR/target/linux/mediatek/image/mt7623.mk fi + fi + + AWG_LUCI_MK=$XDIR/package/feeds/_ruantiblock/luci-app-ruantiblock/Makefile + if [ -f $AWG_LUCI_MK ]; then + if ! grep "PKG_PROVIDES" $AWG_LUCI_MK >/dev/null ; then + sed -i 's/LUCI_PKGARCH:=all/LUCI_PKGARCH:=all\nPKG_PROVIDES:=luci-app-ruantiblock/g' $AWG_LUCI_MK + fi fi make defconfig