From 037167b4cf41922ed106231e88ba3cafbced75cd Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 15 Aug 2020 16:18:19 +0800 Subject: [PATCH] Update r2s_lean.yml --- .github/workflows/r2s_lean.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index c0ada7f597..2ab445cd52 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -31,7 +31,8 @@ jobs: sudo apt-get update sudo apt-get -y --no-install-recommends install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install - sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk + docker rmi `docker images -q` + sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /usr/local/share/boost /opt/ghc - name: Install Repo run: | @@ -67,12 +68,6 @@ jobs: git commit -m 'reset' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs - #git revert --no-edit b65f1ebf0089a2fa0d3e1ad30efc21385a013139 - #git revert --no-edit 2c37fa71f93d150eb67bffdc5bdac8abf5354b16 - #git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d - #git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795 - #git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd - #git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/lede-17.01 -- feeds.conf.default @@ -95,13 +90,15 @@ jobs: cd ../../ git apply ../../enable_autocore.diff #git apply ../../fix_cpufreq.diff + sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner + mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh + echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Build FriendlyWrt run: |