From 9e36e765cd0e0ecd22c95ef1f16713d45c6ad780 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 18 Sep 2020 21:02:26 +0800 Subject: [PATCH] fix --- .github/workflows/r1s_lean.yml | 1 + .github/workflows/r2s_native-dev.yml | 4 ++-- 3_prepare_packages.sh | 9 ++++----- add_passwall.sh | 3 ++- remove_unused_config.sh | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index 035f306..75026af 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -35,6 +35,7 @@ jobs: cd friendlywrt-h5 . ../remove_unused_config.sh cat ../app_config.seed >> configs/config_h5 + sed -i '/sqm-scriptss/d;/kmod-sched/d;' configs/config_h5 cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp diff --git a/.github/workflows/r2s_native-dev.yml b/.github/workflows/r2s_native-dev.yml index fc2fee7..7089c7f 100644 --- a/.github/workflows/r2s_native-dev.yml +++ b/.github/workflows/r2s_native-dev.yml @@ -44,9 +44,9 @@ jobs: CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y' > .config cat ../base_rk3328.seed >> .config cat ../minimal_config.seed >> .config - echo -e 'CONFIG_PACKAGE_kmod-mt7601u\n' >> .config + echo -e 'CONFIG_PACKAGE_kmod-mt7601u=y\n' >> .config sed -i 's/option input\t\tREJECT/option input\t\tACCEPT/' package/network/config/firewall/files/firewall.config - echo -e '\nDYC Build\n' >> package/base-files/files/etc/openwrt_banner + echo -e '\nDYC Build\n' >> package/lean/default-settings/files/openwrt_banner - name: Compile run: | diff --git a/3_prepare_packages.sh b/3_prepare_packages.sh index 7d17226..97080e5 100644 --- a/3_prepare_packages.sh +++ b/3_prepare_packages.sh @@ -1,15 +1,14 @@ if [[ `pwd` == *"rk3328"* ]]; then rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled fi -rm -rf oaf/ && git clone https://github.com/destan19/OpenAppFilter oaf -rm -rf luci-app-adguardhome/ && git clone https://github.com/rufengsuixing/luci-app-adguardhome +[ ! -d luci-app-adguardhome ] && git clone https://github.com/rufengsuixing/luci-app-adguardhome +[ ! -d luci-app-mentohust ] && git clone https://github.com/BoringCat/luci-app-mentohust +[ ! -d mentohust ] && git clone https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk rm -rf luci-theme-argon/ && git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon rm -rf luci-theme-edge/ && git clone -b 18.06 https://github.com/garypang13/luci-theme-edge rm -rf luci-theme-infinityfreedom/ && git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom -rm -rf openwrt-chinadns-ng/ && git clone https://github.com/pexcn/openwrt-chinadns-ng rm -rf luci-app-chinadns-ng/ && git clone https://github.com/WuSiYu/luci-app-chinadns-ng -rm -rf luci-app-mentohust/ && git clone https://github.com/BoringCat/luci-app-mentohust -rm -rf mentohust/ && git clone https://github.com/KyleRicardo/MentoHUST-OpenWrt-ipk +rm -rf openwrt-chinadns-ng/ && git clone https://github.com/pexcn/openwrt-chinadns-ng #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git diff --git a/add_passwall.sh b/add_passwall.sh index a36ad55..5a2cea9 100644 --- a/add_passwall.sh +++ b/add_passwall.sh @@ -4,8 +4,9 @@ echo -e '\nsrc-git lienol https://github.com/xiaorouji/openwrt-package' >> feeds rm -rf feeds/lienol/lienol/ipt2socks rm -rf feeds/lienol/lienol/shadowsocksr-libev rm -rf feeds/lienol/lienol/pdnsd-alt -rm -rf feeds/lienol/package/verysync rm -rf feeds/lienol/lienol/luci-app-verysync +rm -rf feeds/lienol/package/verysync +rm -rf feeds/lienol/package/chinadns-ng rm -rf package/lean/luci-app-kodexplorer rm -rf package/lean/luci-app-pppoe-relay rm -rf package/lean/luci-app-pptp-server diff --git a/remove_unused_config.sh b/remove_unused_config.sh index d4cc89c..54b7921 100644 --- a/remove_unused_config.sh +++ b/remove_unused_config.sh @@ -1,6 +1,6 @@ -[ -f configs/config_rk3328 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d' configs/config_rk3328 -[ -f configs/config_h5 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d' configs/config_h5 -[ -f configs/config_h3 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d' configs/config_h3 +[ -f configs/config_rk3328 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d;/luci-app/d' configs/config_rk3328 +[ -f configs/config_h5 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d;/luci-app/d' configs/config_h5 +[ -f configs/config_h3 ] && sed -i '/=m/d;/CONFIG_IB/d;/CONFIG_SDK/d;/CONFIG_BUILDBOT/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d;/CONFIG_AUDIO_SUPPORT/d;/CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM/d;/CONFIG_VERSION/d;/SAMBA/Id;/modemmanager/d;/CGROUPS/d;/PACKAGE_lib/d;/luci-lib/d;/luci-app/d' configs/config_h3 [ -f configs/config_rk3328 ] && echo -e '\nCONFIG_KERNEL_BUILD_USER="Dayong Chen"\nCONFIG_GRUB_TITLE="OpenWrt on Nanopi devices compiled by DayongChen"' >> configs/config_rk3328 [ -f configs/config_h5 ] && echo -e '\nCONFIG_KERNEL_BUILD_USER="Dayong Chen"\nCONFIG_GRUB_TITLE="OpenWrt on Nanopi devices compiled by DayongChen"' >> configs/config_h5