diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md new file mode 100644 index 00000000..c49f9c4c --- /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..a83d685f --- /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/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.md b/.github/ISSUE_TEMPLATE/issue.md similarity index 80% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/issue.md index 2c2952c1..f2903e8e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/issue.md @@ -1,3 +1,10 @@ +--- +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..3f48b699 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,5 @@ +--- +name: Create a question +about: Ask a question +labels: question +--- 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) diff --git a/build.sh b/build.sh index af188018..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 @@ -21,7 +28,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} @@ -71,9 +78,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 "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" @@ -134,6 +141,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 @@ -289,12 +304,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 diff --git a/config b/config index 51f452ab..f26e208f 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 @@ -225,4 +226,7 @@ CONFIG_PACKAGE_frpc=y CONFIG_PACKAGE_rtty-nossl=y CONFIG_PACKAGE_minicom=y CONFIG_PACKAGE_irqbalance=y -CONFIG_PACKAGE_mtr=y \ No newline at end of file +CONFIG_PACKAGE_mtr=y +CONFIG_KERNEL_DEVMEM=y +CONFIG_KERNEL_DEVKMEM=y +CONFIG_AUTOREMOVE=y 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-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 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 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)