Merge pull request #2 from Ysurac/develop

同步最新的

.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.**
+<!-- A clear and concise description of what the problem is. -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or graphics (drag-and-drop an image) about the feature request here. -->

.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.**
+<!-- A clear and concise description of what the problem is. -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or graphics (drag-and-drop an image) about the feature request here. -->

.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 in details the hardware support being requested and why this support benefits Zephyr. -->
+
+**Describe why you are asking for this support?**
+<!-- Describe why you are asking for this support. -->
+
+**Additional context**
+<!-- Add any other context or graphics (drag-and-drop an image) about the hardware here. -->

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,22 @@
+---
+name: Help wanted
+about: Help needed for configuration/installation of OpenMPTCProuter
+labels: help wanted
+---
+
+<!--- Use this template, else issue may be closed automatically -->
+## Expected Behavior
+<!--- In English please. -->
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- In English please. -->
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Specifications
+
+  - OpenMPTCProuter version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter VPS version: <!--- (Last is not a version) -->
+  - OpenMPTCProuter platform: <!--- (RPI2/RPI3/x86/x86_64) -->
+
+<!--- (please do not attach text files) -->

.github/ISSUE_TEMPLATE/issue.md

@@ -1,3 +1,10 @@
+---
+name: Bug report
+about: Create a report to help us improve OpenMPTCProuter
+labels: bug
+---
+
+<!--- Use this template, else issue may be closed automatically -->
 ## Expected Behavior
 <!--- In English please. -->
 <!--- Tell us what should happen -->

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,5 @@
+---
+name: Create a question
+about: Ask a question
+labels: question
+---

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)

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}
@@ -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 "$OMR_TARGET/source" https://github.com/openwrt/openwrt "2a90d308c73f3f254e93fe3c55d4e40eaabc06e3"
-	_get_repo feeds/packages https://github.com/openwrt/packages "ed39c2f02e1f05c40161986c6d0581f7eba58bea"
+	_get_repo feeds/packages https://github.com/openwrt/packages "1640ff1a1e1de6a3217cdd0c43905d4b2dd83f8f"
-	_get_repo feeds/luci https://github.com/openwrt/luci "6044084a61cdd95e390002cc6a908b33185d457d"
+	_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"
@@ -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

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

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

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

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

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

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