mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Merge branch 'testdevelop' into develop
This commit is contained in:
commit
09b49656da
2 changed files with 20 additions and 8 deletions
26
build.sh
26
build.sh
|
@ -1,4 +1,11 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (C) 2017 OVH OverTheBox
|
||||||
|
# Copyright (C) 2017-2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
|
||||||
|
#
|
||||||
|
# This is free software, licensed under the GNU General Public License v3.
|
||||||
|
# See /LICENSE for more information.
|
||||||
|
#
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
@ -263,12 +270,6 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/download-ipv4.patch; then
|
||||||
fi
|
fi
|
||||||
echo "Done"
|
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
|
if [ -f target/linux/mediatek/patches-5.4/0999-hnat.patch ]; then
|
||||||
rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch
|
rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch
|
||||||
fi
|
fi
|
||||||
|
@ -303,12 +304,21 @@ if [ "$OMR_KERNEL" = "5.4" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#rm -rf feeds/packages/libs/libwebp
|
#rm -rf feeds/packages/libs/libwebp
|
||||||
|
cd "../.."
|
||||||
echo "Update feeds index"
|
|
||||||
rm -rf feeds/luci/modules/luci-mod-network
|
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-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
|
[ -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
|
cp .config .config.keep
|
||||||
scripts/feeds clean
|
scripts/feeds clean
|
||||||
scripts/feeds update -a
|
scripts/feeds update -a
|
||||||
|
|
2
config
2
config
|
@ -7,6 +7,7 @@ CONFIG_BUSYBOX_CONFIG_ARP=y
|
||||||
CONFIG_BUSYBOX_CONFIG_ARPING=y
|
CONFIG_BUSYBOX_CONFIG_ARPING=y
|
||||||
CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
|
CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
|
||||||
CONFIG_BUSYBOX_CONFIG_BASE64=y
|
CONFIG_BUSYBOX_CONFIG_BASE64=y
|
||||||
|
CONFIG_BUSYBOX_CONFIG_BC=y
|
||||||
CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
|
CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
|
||||||
CONFIG_BUSYBOX_CONFIG_DELUSER=y
|
CONFIG_BUSYBOX_CONFIG_DELUSER=y
|
||||||
CONFIG_BUSYBOX_CONFIG_DIFF=y
|
CONFIG_BUSYBOX_CONFIG_DIFF=y
|
||||||
|
@ -228,3 +229,4 @@ CONFIG_PACKAGE_rtty-nossl=y
|
||||||
CONFIG_PACKAGE_minicom=y
|
CONFIG_PACKAGE_minicom=y
|
||||||
CONFIG_PACKAGE_irqbalance=y
|
CONFIG_PACKAGE_irqbalance=y
|
||||||
CONFIG_PACKAGE_mtr=y
|
CONFIG_PACKAGE_mtr=y
|
||||||
|
CONFIG_AUTOREMOVE=y
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue