Update r2s_lean_minimal.yml
This commit is contained in:
2
.github/workflows/r2s_lean_minimal.yml
vendored
2
.github/workflows/r2s_lean_minimal.yml
vendored
@@ -129,7 +129,7 @@ jobs:
|
||||
git checkout upstream/master -b tmp
|
||||
#git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c
|
||||
git checkout origin/master-v19.07.1
|
||||
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
|
||||
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs || true
|
||||
git add target/linux/sunxi/image/cortex-a53.mk
|
||||
git rebase --continue
|
||||
#rm -rf package/kernel/mt76/Makefile package/network/services/hostapd package/kernel/mac80211
|
||||
|
||||
Reference in New Issue
Block a user