From ebefe554d210b1596f5717ba66e824e72d388433 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 14 Oct 2020 15:32:54 +0200 Subject: [PATCH 1/4] Add Occitan support --- build.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 1de3f346..4803e0bb 100755 --- a/build.sh +++ b/build.sh @@ -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 From 3c45f7ada97b8bb1e9d9d17ab3a3dd70ef53e1e0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 14 Oct 2020 17:28:39 +0200 Subject: [PATCH 2/4] Try to free some disk space --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index d794c24d..4abe05ec 100644 --- a/config +++ b/config @@ -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 From 2cbc5766689996543835453d984dd098578df14d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 27 Oct 2020 18:32:21 +0100 Subject: [PATCH 3/4] Add header as initial script come from OVH --- build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.sh b/build.sh index 4803e0bb..39f4437c 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,11 @@ #!/bin/sh +# +# Copyright (C) 2017 OVH OverTheBox +# Copyright (C) 2017-2020 Ycarus (Yannick Chabanois) for OpenMPTCProuter project +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# set -e From abfd0a1cb5bbd2a7c6ede92d206b0993fe40a3d2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Oct 2020 14:39:12 +0100 Subject: [PATCH 4/4] Add busybox bc --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 4abe05ec..b45b6c96 100644 --- a/config +++ b/config @@ -7,6 +7,7 @@ CONFIG_BUSYBOX_CONFIG_ARP=y CONFIG_BUSYBOX_CONFIG_ARPING=y CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_BUSYBOX_CONFIG_BASE64=y +CONFIG_BUSYBOX_CONFIG_BC=y CONFIG_BUSYBOX_CONFIG_CHPASSWD=y CONFIG_BUSYBOX_CONFIG_DELUSER=y CONFIG_BUSYBOX_CONFIG_DIFF=y