1
0
Fork 0
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:
suyuan 2020-09-24 10:21:26 +08:00
commit dea2c9dd09
4 changed files with 11 additions and 25 deletions

View file

@ -71,9 +71,9 @@ fi
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master" #_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
if [ "$OMR_OPENWRT" = "default" ]; then if [ "$OMR_OPENWRT" = "default" ]; then
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "d643b10a76965a94684012d2ddf36e2bcc146274" _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "620f9c773413a0deaeda2bdc22d5e9cb89b9317f"
_get_repo feeds/packages https://github.com/openwrt/packages "0daa9fb1dd48ee63024a5fc24dd3c85e112f7ed6" _get_repo feeds/packages https://github.com/openwrt/packages "ed39c2f02e1f05c40161986c6d0581f7eba58bea"
_get_repo feeds/luci https://github.com/openwrt/luci "4f6c054d7a468b980538461ede1da40789af4d46" _get_repo feeds/luci https://github.com/openwrt/luci "6044084a61cdd95e390002cc6a908b33185d457d"
elif [ "$OMR_OPENWRT" = "master" ]; then elif [ "$OMR_OPENWRT" = "master" ]; then
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master"
_get_repo feeds/packages https://github.com/openwrt/packages "master" _get_repo feeds/packages https://github.com/openwrt/packages "master"
@ -293,6 +293,7 @@ fi
echo "Update feeds index" 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
cp .config .config.keep cp .config .config.keep
scripts/feeds clean scripts/feeds clean

View file

@ -3,3 +3,5 @@ CONFIG_TARGET_mvebu_cortexa9=y
CONFIG_TARGET_mvebu_cortexa9_DEVICE_linksys_wrt3200acm=y CONFIG_TARGET_mvebu_cortexa9_DEVICE_linksys_wrt3200acm=y
CONFIG_PACKAGE_kmod-6lowpan=y CONFIG_PACKAGE_kmod-6lowpan=y
CONFIG_PACKAGE_luci-app-advanced-reboot=y CONFIG_PACKAGE_luci-app-advanced-reboot=y
# CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set
CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y

View file

@ -0,0 +1,5 @@
root:$1$ie.8vTnt$7EzhI1ZYiwp8hSAC4eSId0:18473:0:99999:7:::
daemon:*:0:0:99999:7:::
ftp:*:0:0:99999:7:::
network:*:0:0:99999:7:::
nobody:*:0:0:99999:7:::

View file

@ -1,22 +0,0 @@
From 3a466fd3d5b921c085fd3c863cab3f1afdb90c9c Mon Sep 17 00:00:00 2001
From: Frank Wunderlich <frank-w@public-files.de>
Date: Sun, 12 Jan 2020 16:46:33 +0100
Subject: [PATCH] arm: dts: add pause to port6 of switch
to be same as gmac0
---
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index 52343bd76fe5..7b8383af87e0 100644
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -253,6 +253,7 @@
fixed-link {
speed = <1000>;
full-duplex;
+ pause;
};
};
};