remove necessary fixes

stupidloud · Sep 6, 2020 · d56168f · d56168f
1 parent d2b7193
commit d56168f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml
@@ -48,12 +48,10 @@ jobs:
 
       - name: Mods
         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
           . ../remove_unused_config.sh
           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
           git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
           git checkout upstream/dev-19.07 -b tmp

diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml
@@ -52,13 +52,12 @@ jobs:
 
       - name: Mods
         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
           . ../remove_unused_config.sh
           cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed
           cat ../app_config.seed >> ../base_rk3328.seed
           cat ../base_rk3328.seed > configs/config_rk3328
-          echo 'CONFIG_KERNEL_CGROUPS=y' >> 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
@@ -68,7 +67,6 @@ jobs:
           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
-          #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 '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