diff --git a/scripts/patches.sh b/scripts/patches.sh index c4a5c5b..d125148 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -32,6 +32,7 @@ mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type if [ $BRANCH == 'master' ]; then sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile + git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd # fix po path for snapshot find package/ -follow -type d -path '*/po/zh-cn' | xargs dirname | xargs -n1 -i sh -c "rm -f {}/zh_Hans; ln -sf zh-cn {}/zh_Hans"