diff --git a/README.md b/README.md index a332c0a9..ed21fbcd 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ OpenMPTCProuter is an open source solution to aggregate and encrypt multiple internet connections and terminates it over any VPS which make clients benefit security, reliability, net neutrality, as well as dedicated public IP. -The aggregation is based on Multipath TCP (MPTCP), which is ISP, WAN type, and latency independent "whether it was Fiber, VDSL, SHDSL, ADSL or even 4G", different scenarios can be configured to have either aggregation or failover based on MPTCP. +The aggregation is based on Multipath TCP (MPTCP), which is ISP, WAN type, and latency independent "whether it was Fiber, VDSL, SHDSL, ADSL, 4G or even 5G", different scenarios can be configured to have either aggregation or failover based on MPTCP. Aggregation via [Multi-link VPN (MLVPN)](https://github.com/markfoodyburton/MLVPN/commits/new-reorder) and [Glorytun UDP](https://github.com/angt/glorytun) with multipath support are also supported. diff --git a/build.sh b/build.sh index 597abc25..8a3ebd24 100755 --- a/build.sh +++ b/build.sh @@ -42,7 +42,7 @@ OMR_KERNEL=${OMR_KERNEL:-5.4} OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)} OMR_REPO=${OMR_REPO:-http://$OMR_HOST:$OMR_PORT/release/$OMR_RELEASE/$OMR_TARGET} -OMR_FEED_URL="${OMR_FEED_URL:-https://github.com/suyuan168/openmptcprouter-feeds}" +OMR_FEED_URL="${OMR_FEED_URL:-https://github.com/ysurac/openmptcprouter-feeds}" OMR_FEED_SRC="${OMR_FEED_SRC:-develop}" CUSTOM_FEED_URL="${CUSTOM_FEED_URL}" diff --git a/config-p2w_r619ac b/config-p2w_r619ac index 6277dc6a..3ce74bfc 100644 --- a/config-p2w_r619ac +++ b/config-p2w_r619ac @@ -1,9 +1,7 @@ CONFIG_TARGET_ipq40xx=y CONFIG_TARGET_ipq40xx_generic=y CONFIG_TARGET_ipq40xx_generic_DEVICE_p2w_r619ac-128m=y -CONFIG_PACKAGE_ipq-wifi-p2w_r619ac=y -CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y -CONFIG_DEFAULT_kmod-ath10k-ct=y +CONFIG_PACKAGE_kmod-6lowpan=y # CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PACKAGE_ipq-wifi-p2w_r619ac=y diff --git a/root/package/base-files/files/etc/shadow b/root/package/base-files/files/etc/shadow deleted file mode 100644 index 40218708..00000000 --- a/root/package/base-files/files/etc/shadow +++ /dev/null @@ -1,5 +0,0 @@ -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::: diff --git a/root/rules.mk b/root/rules.mk index f79340b1..a33ba4bf 100644 --- a/root/rules.mk +++ b/root/rules.mk @@ -174,6 +174,8 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) $(call qstrip,$( TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_ASFLAGS_DEFAULT = $(TARGET_CFLAGS) TARGET_ASFLAGS = $(TARGET_ASFLAGS_DEFAULT) +TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include +TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) LIBGCC_S_PATH=$(realpath $(wildcard $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)))) LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s)