diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index 97ccfed..e193f34 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -54,13 +54,13 @@ jobs: cat ../app_config.seed >> configs/config_h5 cd friendlywrt git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream - git checkout upstream/dev-19.07 -b tmp + git checkout upstream/19.07 -b tmp git mv README.md README && git commit -m 'undo rename readme for rebasing' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh - git checkout upstream/dev-19.07 -- feeds.conf.default + git checkout upstream/19.07 -- feeds.conf.default sed -i '/ucl upx/d' tools/Makefile sudo apt -y install upx-ucl && mkdir -p staging_dir/host/bin && ln -s /usr/bin/upx-ucl staging_dir/host/bin/upx sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index 4aa0e7a..5023dd5 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -60,13 +60,13 @@ jobs: cat ../base_rk3328.seed > configs/config_rk3328 cd friendlywrt git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream - git checkout upstream/dev-19.07 -b tmp + git checkout upstream/19.07 -b tmp git mv README.md README && git commit -m 'undo rename readme for rebasing' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh - git checkout upstream/dev-19.07 -- feeds.conf.default + git checkout upstream/19.07 -- feeds.conf.default sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/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