From 16818d7246b34f3a3d2676479790e9d90178c97f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 21 Mar 2020 12:13:01 +0100 Subject: [PATCH 01/18] Fix smsc75xx patch --- patches/smsc75xx.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/smsc75xx.patch b/patches/smsc75xx.patch index 1dd1cbbb..e08dab97 100644 --- a/patches/smsc75xx.patch +++ b/patches/smsc75xx.patch @@ -1,7 +1,7 @@ Index: package/kernel/linux/modules/usb.mk =================================================================== ---- package/kernel/linux/modules/usb.mk (revisione 42462) -+++ package/kernel/linux/modules/usb.mk (copia locale) +--- a/package/kernel/linux/modules/usb.mk (revisione 42462) ++++ b/package/kernel/linux/modules/usb.mk (copia locale) @@ -1091,8 +1091,21 @@ endef From d043911e649fc4ebe5e8803f308ffaa6b70d9c59 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 24 Sep 2020 10:07:49 +0200 Subject: [PATCH 02/18] Add a OMR_PACKAGES_URL settings and change default port to 80 --- build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index af188018..e5a9dd71 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ _get_repo() ( OMR_DIST=${OMR_DIST:-openmptcprouter} OMR_HOST=${OMR_HOST:-$(curl -sS ifconfig.co)} -OMR_PORT=${OMR_PORT:-8000} +OMR_PORT=${OMR_PORT:-80} OMR_KEEPBIN=${OMR_KEEPBIN:-no} OMR_IMG=${OMR_IMG:-yes} #OMR_UEFI=${OMR_UEFI:-yes} @@ -134,6 +134,14 @@ if [ "$OMR_DIST" = "openmptcprouter" ]; then src/gz openwrt_routing http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/routing src/gz openwrt_telephony http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/telephony EOF +elif [ -n "$OMR_PACKAGES_URL" ]; then + cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<-EOF + src/gz openwrt_luci ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/luci + src/gz openwrt_packages ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/packages + src/gz openwrt_base ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/base + src/gz openwrt_routing ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/routing + src/gz openwrt_telephony ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/telephony + EOF else cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<-EOF src/gz openwrt_luci http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/luci From c7492fb5594e63317977ed6288c09251399ab660 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 1 Oct 2020 16:47:17 +0200 Subject: [PATCH 03/18] Add KERNEL_ARM_MODULE_PLTS --- config-bpi-r2 | 1 + config-bpi-r64 | 9 +++++++++ config-rpi3 | 1 + config-rpi4 | 1 + config-wrt3200acm | 1 + config-wrt32x | 1 + 6 files changed, 14 insertions(+) create mode 100644 config-bpi-r64 diff --git a/config-bpi-r2 b/config-bpi-r2 index 4022b63d..1ff4480e 100644 --- a/config-bpi-r2 +++ b/config-bpi-r2 @@ -17,3 +17,4 @@ CONFIG_PACKAGE_mkf2fs=y # CONFIG_PACKAGE_kmod-rtl8812au-ct is not set # CONFIG_PACKAGE_kmod-mt6625l-bt is not set # CONFIG_PACKAGE_kmod-mt6625l-wlan-gen-2 is not set +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-bpi-r64 b/config-bpi-r64 new file mode 100644 index 00000000..dbbb6649 --- /dev/null +++ b/config-bpi-r64 @@ -0,0 +1,9 @@ +CONFIG_TARGET_mediatek=y +CONFIG_TARGET_mediatek_mt7622=y +CONFIG_TARGET_mediatek_mt7622_DEVICE_bpi_bananapi-r64=y +# CONFIG_PACKAGE_kmod-mt6625l-bt is not set +# CONFIG_PACKAGE_kmod-mt6625l-wlan-gen-2 is not set +CONFIG_PACKAGE_uboot-mediatek=y +CONFIG_PACKAGE_uboot-envtools=y +CONFIG_PACKAGE_mt7622-preloader=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-rpi3 b/config-rpi3 index e5370b2d..da6c42db 100644 --- a/config-rpi3 +++ b/config-rpi3 @@ -3,3 +3,4 @@ CONFIG_TARGET_bcm27xx_bcm2710=y CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y CONFIG_PACKAGE_kmod-ath10k-ct=n CONFIG_PACKAGE_kmod-ath9k=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-rpi4 b/config-rpi4 index 7fb408aa..39fb7fb7 100644 --- a/config-rpi4 +++ b/config-rpi4 @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-ath10k-ct=n CONFIG_PACKAGE_kmod-ath9k=y CONFIG_PACKAGE_bcm27xx-eeprom=y CONFIG_PACKAGE_bcm27xx-userland=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-wrt3200acm b/config-wrt3200acm index 1c560ff5..1b146609 100644 --- a/config-wrt3200acm +++ b/config-wrt3200acm @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-6lowpan=y CONFIG_PACKAGE_luci-app-advanced-reboot=y # CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-wrt32x b/config-wrt32x index eba5cbec..f362f397 100644 --- a/config-wrt32x +++ b/config-wrt32x @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-6lowpan=y CONFIG_PACKAGE_luci-app-advanced-reboot=y # CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y From 5016e1c4bcc201185412354b34ac595ae92177eb Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 1 Oct 2020 16:47:46 +0200 Subject: [PATCH 04/18] Update OpenWrt --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index e5a9dd71..3f87d67a 100755 --- a/build.sh +++ b/build.sh @@ -71,9 +71,9 @@ fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" if [ "$OMR_OPENWRT" = "default" ]; then - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "620f9c773413a0deaeda2bdc22d5e9cb89b9317f" - _get_repo feeds/packages https://github.com/openwrt/packages "ed39c2f02e1f05c40161986c6d0581f7eba58bea" - _get_repo feeds/luci https://github.com/openwrt/luci "6044084a61cdd95e390002cc6a908b33185d457d" + _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "624298dc27d6306015bf79cacf905e4e1a33026c" + _get_repo feeds/packages https://github.com/openwrt/packages "2095656dcaebd7e3f53af600319e04db9de70b7f" + _get_repo feeds/luci https://github.com/openwrt/luci "b60ea0b8bf5721e908530d376802b84958deef76" elif [ "$OMR_OPENWRT" = "master" ]; then _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" _get_repo feeds/packages https://github.com/openwrt/packages "master" From bfb83daf465dff0c8756e620a81319c73dd29728 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Oct 2020 16:19:14 +0200 Subject: [PATCH 05/18] Add text in issue that issue can be closed if template is not used --- .github/ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2c2952c1..d2e5e3d8 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,3 +1,4 @@ + ## Expected Behavior From 617037d27f699c9e4e8fa3e6d07b9eaf465cf747 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Oct 2020 17:41:47 +0200 Subject: [PATCH 06/18] Github Actions is used instead of CircleCI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c198b1ec..a332c0a9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![CircleCI](https://circleci.com/gh/Ysurac/openmptcprouter-feeds.svg?style=svg)](https://circleci.com/gh/Ysurac/openmptcprouter-feeds) +![openmptcprouter](https://github.com/Ysurac/openmptcprouter-feeds/workflows/openmptcprouter/badge.svg) ![Latest tag](https://img.shields.io/github/tag/ysurac/openmptcprouter-feeds.svg) [![Paypal](https://www.openmptcprouter.com/img/donate-PayPal-green.svg)](https://www.paypal.me/ycarus) [![Flattr](https://www.openmptcprouter.com/img/donate-flattr-yellow.svg)](https://flattr.com/@ycarus) From 65e82d3d4359c35d0b6959ab8a1f8b219a8beda1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 5 Oct 2020 15:00:17 +0200 Subject: [PATCH 07/18] Update OpenWrt --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 3f87d67a..b1a145f2 100755 --- a/build.sh +++ b/build.sh @@ -71,9 +71,9 @@ fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" if [ "$OMR_OPENWRT" = "default" ]; then - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "624298dc27d6306015bf79cacf905e4e1a33026c" - _get_repo feeds/packages https://github.com/openwrt/packages "2095656dcaebd7e3f53af600319e04db9de70b7f" - _get_repo feeds/luci https://github.com/openwrt/luci "b60ea0b8bf5721e908530d376802b84958deef76" + _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "2a90d308c73f3f254e93fe3c55d4e40eaabc06e3" + _get_repo feeds/packages https://github.com/openwrt/packages "1640ff1a1e1de6a3217cdd0c43905d4b2dd83f8f" + _get_repo feeds/luci https://github.com/openwrt/luci "c2b22afb9a9a770270be6dbee323ae497b4b988b" elif [ "$OMR_OPENWRT" = "master" ]; then _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" _get_repo feeds/packages https://github.com/openwrt/packages "master" From 5d4b8339c4bdb93806c2003594196c660e99f865 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 6 Oct 2020 14:55:53 +0200 Subject: [PATCH 08/18] More template for issues --- .github/ISSUE_TEMPLATE/enhancement.md | 17 ++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++++++ .github/ISSUE_TEMPLATE/hardware_support.md | 17 ++++++++++++++++ .../issue.md} | 6 ++++++ .github/ISSUE_TEMPLATE/question.md | 5 +++++ 5 files changed, 65 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/hardware_support.md rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/issue.md} (86%) create mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md new file mode 100644 index 00000000..345c31aa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -0,0 +1,17 @@ +--- +name: Enhancement +about: Suggest enhancements +labels: Enhancement +--- + +**Is your enhancement proposal related to a problem? Please describe.** + + +**Describe the solution you'd like** + + +**Describe alternatives you've considered** + + +**Additional context** + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..d8dca141 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: feature request +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** + + +**Describe the solution you'd like** + + +**Describe alternatives you've considered** + + +**Additional context** + diff --git a/.github/ISSUE_TEMPLATE/hardware_support.md b/.github/ISSUE_TEMPLATE/hardware_support.md new file mode 100644 index 00000000..d3674a01 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/hardware_support.md @@ -0,0 +1,17 @@ +--- +name: Hardware Support +about: Suggest adding hardware support +title: '' +labels: Hardware Support +assignees: '' + +--- + +**Is this request related to a missing driver support for a particular hardware platform, SoC or board? Please describe.** + + +**Describe why you are asking for this support?** + + +**Additional context** + diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/issue.md similarity index 86% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/issue.md index d2e5e3d8..f2903e8e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/issue.md @@ -1,3 +1,9 @@ +--- +name: Bug report +about: Create a report to help us improve OpenMPTCProuter +labels: bug +--- + ## Expected Behavior diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 00000000..a1abcb31 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,5 @@ +--- +name: Create a question +about: Ask a question +labels: Question +--- From 615d596eceaf09a413972fdf42c798056b2f6d2f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 7 Oct 2020 09:42:21 +0200 Subject: [PATCH 09/18] Add help wanted issue and fix issues template --- .github/ISSUE_TEMPLATE/enhancement.md | 2 +- .github/ISSUE_TEMPLATE/hardware_support.md | 2 +- .github/ISSUE_TEMPLATE/help.md | 22 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/question.md | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/help.md diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md index 345c31aa..c49f9c4c 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.md +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -1,7 +1,7 @@ --- name: Enhancement about: Suggest enhancements -labels: Enhancement +labels: enhancement --- **Is your enhancement proposal related to a problem? Please describe.** diff --git a/.github/ISSUE_TEMPLATE/hardware_support.md b/.github/ISSUE_TEMPLATE/hardware_support.md index d3674a01..a83d685f 100644 --- a/.github/ISSUE_TEMPLATE/hardware_support.md +++ b/.github/ISSUE_TEMPLATE/hardware_support.md @@ -2,7 +2,7 @@ name: Hardware Support about: Suggest adding hardware support title: '' -labels: Hardware Support +labels: hardware support assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md new file mode 100644 index 00000000..bf7391fe --- /dev/null +++ b/.github/ISSUE_TEMPLATE/help.md @@ -0,0 +1,22 @@ +--- +name: Help wanted +about: Help needed for configuration/installation of OpenMPTCProuter +labels: help wanted +--- + + +## Expected Behavior + + + +## Current Behavior + + + +## Specifications + + - OpenMPTCProuter version: + - OpenMPTCProuter VPS version: + - OpenMPTCProuter platform: + + \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index a1abcb31..3f48b699 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,5 +1,5 @@ --- name: Create a question about: Ask a question -labels: Question +labels: question --- From 8c1c7716a6b89bdcb9a5fc3a32da77d29c12bff6 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 8 Oct 2020 14:27:33 +0200 Subject: [PATCH 10/18] Add /dev/mem and /dev/kmem --- config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config b/config index c40719ef..d794c24d 100644 --- a/config +++ b/config @@ -246,3 +246,5 @@ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y # CONFIG_LUCI_CSSTIDY is not set # CONFIG_LIBCURL_WOLFSSL is not set # CONFIG_PACKAGE_libustream-wolfssl is not set +CONFIG_KERNEL_DEVMEM=y +CONFIG_KERNEL_DEVKMEM=y From 666436fe0e894bc708b5b843d5b3886343e0d909 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 9 Oct 2020 14:25:52 +0200 Subject: [PATCH 11/18] Update OpenWrt --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index b1a145f2..7c87ee8f 100755 --- a/build.sh +++ b/build.sh @@ -71,9 +71,9 @@ fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" if [ "$OMR_OPENWRT" = "default" ]; then - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "2a90d308c73f3f254e93fe3c55d4e40eaabc06e3" - _get_repo feeds/packages https://github.com/openwrt/packages "1640ff1a1e1de6a3217cdd0c43905d4b2dd83f8f" - _get_repo feeds/luci https://github.com/openwrt/luci "c2b22afb9a9a770270be6dbee323ae497b4b988b" + _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "a439f1bb478b4b8b4134dbed76266c0032625b6b" + _get_repo feeds/packages https://github.com/openwrt/packages "05769970213a5f9ffb81506b18da288890c05949" + _get_repo feeds/luci https://github.com/openwrt/luci "a805a3178f902fe609d3d4a6c7b6b5b1dad88838" elif [ "$OMR_OPENWRT" = "master" ]; then _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" _get_repo feeds/packages https://github.com/openwrt/packages "master" From f4799692da60148afa56c188893b350d268216ce Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 10:14:36 +0200 Subject: [PATCH 12/18] Fix R2S config and add ARM_MODULE_PLTS where needed --- config-espressobin | 1 + config-r2s | 3 ++- config-rpi2 | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config-espressobin b/config-espressobin index b11d9a82..6e43d5d0 100644 --- a/config-espressobin +++ b/config-espressobin @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-6lowpan=y CONFIG_PACKAGE_luci-app-advanced-reboot=y # CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-r2s b/config-r2s index 15c5d543..af12d580 100644 --- a/config-r2s +++ b/config-r2s @@ -1,4 +1,5 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y -CONFIG_TARGET_ramips_armv8_DEVICE_friendlyarm_nanopi-r2s=y +CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y CONFIG_PACKAGE_kmod-6lowpan=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-rpi2 b/config-rpi2 index e79e72d2..aa976b33 100644 --- a/config-rpi2 +++ b/config-rpi2 @@ -5,3 +5,4 @@ CONFIG_PACKAGE_kmod-ath10k-ct=n CONFIG_PACKAGE_kmod-ath9k=y CONFIG_PACKAGE_bcm27xx-eeprom=y CONFIG_PACKAGE_bcm27xx-userland=y +CONFIG_KERNEL_ARM_MODULE_PLTS=y From e11fbd4986eaf15b5c8e0b0f2e91a3d453c60685 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:32:57 +0200 Subject: [PATCH 13/18] Add Occitan translation --- build.sh | 6 ++++++ patches/luci-occitan.patch | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 patches/luci-occitan.patch diff --git a/build.sh b/build.sh index 7c87ee8f..effb18f2 100755 --- a/build.sh +++ b/build.sh @@ -263,6 +263,12 @@ 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 diff --git a/patches/luci-occitan.patch b/patches/luci-occitan.patch new file mode 100644 index 00000000..4aba6102 --- /dev/null +++ b/patches/luci-occitan.patch @@ -0,0 +1,10 @@ +--- a/feeds/luci/luci.mk 2020-10-13 09:58:19.887513368 +0200 ++++ b/feeds/luci/luci.mk 2020-10-13 09:04:51.724277184 +0200 +@@ -34,6 +34,7 @@ + LUCI_LANG.mr=Marāṭhī (Marathi) + LUCI_LANG.ms=Bahasa Melayu (Malay) + LUCI_LANG.nb_NO=Norsk (Norwegian) ++LUCI_LANG.oc=Occitan + LUCI_LANG.pl=Polski (Polish) + LUCI_LANG.pt_BR=Português do Brasil (Brazilian Portuguese) + LUCI_LANG.pt=Português (Portuguese) From 724e343390d65e6738065e654be160af6f396aa0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 12:49:08 +0200 Subject: [PATCH 14/18] Remove Occitan patch for now --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index effb18f2..1de3f346 100755 --- a/build.sh +++ b/build.sh @@ -263,11 +263,11 @@ 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" +#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 From ebefe554d210b1596f5717ba66e824e72d388433 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 14 Oct 2020 15:32:54 +0200 Subject: [PATCH 15/18] 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 16/18] 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 17/18] 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 18/18] 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