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

Build: remove poison

Browse Source
This commit is contained in:
John Doe
2021-10-21 19:01:41 +08:00
parent 9eeddc4990
commit 723ab4e218
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/merge_packages.sh
View File

@@ -44,3 +44,4 @@ merge_package https://github.com/zxlhhyccc/luci-app-v2raya
merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/aliyundrive-webdav
merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav merge_package https://github.com/messense/aliyundrive-webdav/trunk/openwrt/luci-app-aliyundrive-webdav
drop_package luci-app-cd8021x drop_package luci-app-cd8021x
drop_package luci-app-cifs

4
scripts/patches.sh
View File

@@ -24,8 +24,8 @@ sed -i 's/5.0/1.0/' .ccache/ccache.conf || true
if [ $BRANCH == 'master' ]; then if [ $BRANCH == 'master' ]; then
sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile #sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile
git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd #git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd
# fix po path for snapshot # 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" 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"