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

Update r1s_lean_h3.yml

Browse Source
This commit is contained in:
klever1988
2020-08-04 14:37:12 +08:00
committed by GitHub
parent 14b9cfaa5e
commit b1e069b265
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/r1s_lean_h3.yml vendored
View File

@@ -42,7 +42,7 @@ jobs:
run: |
mkdir friendlywrt-h3
cd friendlywrt-h3
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h3.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m h3.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo sync -c --no-tags --no-clone-bundle -j8
cd friendlywrt/ && git fetch --unshallow
@@ -54,19 +54,19 @@ jobs:
. ../remove_unused_config.sh
cat ../app_config.seed >> configs/config_h3
echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h3
sed -i '/docker/Id;/containerd/Id;/runc/Id;/iptparser/Id' configs/config_h3 #fix compile error
sed -i '/STAMP_BUILT/d' friendlywrt/feeds/packages/utils/runc/Makefile friendlywrt/feeds/packages/utils/containerd/Makefile #fix compile error
cd friendlywrt
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
git checkout upstream/master -b tmp
git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/
git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream
git checkout upstream/lede-17.01 -b tmp
#git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/
git rm README.md
git commit -m 'reset'
git checkout master-v18.06.1
git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing
git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto tmp -X theirs
#rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
git checkout upstream/master -- feeds.conf.default
git checkout master-v19.07.1
#git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
rm -f target/linux/allwinner-h5/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
git checkout upstream/lede-17.01 -- feeds.conf.default
sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default
cd package/lean/
#git clone https://github.com/jerrykuku/lua-maxminddb.git