yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove necessary fixes

Browse Source
This commit is contained in:
root
2020-09-07 03:15:28 +08:00
parent d2b71938b0
commit d56168f0ff
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/r1s_lienol.yml vendored
View File

@@ -48,12 +48,10 @@ jobs:
- name: Mods - name: Mods
run: | run: |
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git config --global user.email "action@github.com" && git config --global user.name "GitHub Action"
cd friendlywrt-h5 cd friendlywrt-h5
. ../remove_unused_config.sh . ../remove_unused_config.sh
cat ../app_config.seed >> configs/config_h5 cat ../app_config.seed >> configs/config_h5
#echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h5
sed -i '/docker/Id;/containerd/Id;/runc/Id;/iptparser/Id' configs/config_h5 #fix compile error
cd friendlywrt cd friendlywrt
git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/dev-19.07 -b tmp git checkout upstream/dev-19.07 -b tmp

4
.github/workflows/r2s_lienol.yml vendored
View File

@@ -52,13 +52,12 @@ jobs:
- name: Mods - name: Mods
run: | run: |
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git config --global user.email "action@github.com" && git config --global user.name "GitHub Action"
cd friendlywrt-rk3328 cd friendlywrt-rk3328
. ../remove_unused_config.sh . ../remove_unused_config.sh
cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed
cat ../app_config.seed >> ../base_rk3328.seed cat ../app_config.seed >> ../base_rk3328.seed
cat ../base_rk3328.seed > configs/config_rk3328 cat ../base_rk3328.seed > configs/config_rk3328
echo 'CONFIG_KERNEL_CGROUPS=y' >> configs/config_rk3328
cd friendlywrt cd friendlywrt
git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/dev-19.07 -b tmp git checkout upstream/dev-19.07 -b tmp
@@ -68,7 +67,6 @@ jobs:
rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch 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 sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh
git checkout upstream/dev-19.07 -- feeds.conf.default git checkout upstream/dev-19.07 -- feeds.conf.default
#sed -i 's/Lienol\/openwrt-package/SuLingGG\/openwrt-package/' feeds.conf.default
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings 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 '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 sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh