1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Merge pull request #7 from Ysurac/develop

修复一些
This commit is contained in:
suyuan 2020-10-18 15:57:49 +08:00 committed by GitHub
commit 741a4b88ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions

View file

@ -263,12 +263,6 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/download-ipv4.patch; then
fi
echo "Done"
#echo "Add Occitan translation support"
#if ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-occitan.patch; then
# patch -N -p1 -s < ../../patches/luci-occitan.patch
#fi
#echo "Done"
if [ -f target/linux/mediatek/patches-5.4/0999-hnat.patch ]; then
rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch
fi
@ -303,12 +297,21 @@ if [ "$OMR_KERNEL" = "5.4" ]; then
fi
#rm -rf feeds/packages/libs/libwebp
echo "Update feeds index"
cd "../.."
rm -rf feeds/luci/modules/luci-mod-network
[ -d feeds/${OMR_DIST}/luci-mod-status ] && rm -rf feeds/luci/modules/luci-mod-status
[ -d feeds/${OMR_DIST}/luci-app-statistics ] && rm -rf feeds/luci/applications/luci-app-statistics
echo "Add Occitan translation support"
if ! patch -Rf -N -p1 -s --dry-run < patches/luci-occitan.patch; then
patch -N -p1 -s < patches/luci-occitan.patch
#sh feeds/luci/build/i18n-add-language.sh oc
fi
[ -d $OMR_FEED/luci-base/po/oc ] && cp -rf $OMR_FEED/luci-base/po/oc feeds/luci/modules/luci-base/po/
echo "Done"
cd "$OMR_TARGET/source"
echo "Update feeds index"
cp .config .config.keep
scripts/feeds clean
scripts/feeds update -a

1
config
View file

@ -248,3 +248,4 @@ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
# CONFIG_PACKAGE_libustream-wolfssl is not set
CONFIG_KERNEL_DEVMEM=y
CONFIG_KERNEL_DEVKMEM=y
CONFIG_AUTOREMOVE=y