mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'testdevelop' into develop"

Browse source 
This reverts commit c97e0555e1, reversing
changes made to 0659816963.
This commit is contained in:
suyuan 2020-12-20 23:33:10 +08:00
parent b89c4f4039
commit 47b043a29e
2 changed files with 3 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build.sh
View file

@ -78,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 "bfc433efd4a0c6875a92981d1bd2a5e3e60c61c6"
_get_repo feeds/packages https://github.com/openwrt/packages "85dbb482017faec4d69c21b57a5a0afb8095f48a"
_get_repo feeds/luci https://github.com/openwrt/luci "833e25d24a8cbf8dd587ee4424ef49b3e4e5f210"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "d346beb08c3a7867497000dc382635ee8ea0eedb"
_get_repo feeds/packages https://github.com/openwrt/packages "ea9d7884a2e35942c5e160b84228903988d517e9"
_get_repo feeds/luci https://github.com/openwrt/luci "d80a1718281cd90a1d14395ff0f7dbb23088b562"
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"
@ -280,12 +280,6 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/download-ipv4.patch; then
fi
echo "Done"
echo "Remove check rsync"
if [ "$(grep rsync include/prereq-build.mk)" != "" ]; then
patch -N -p1 -s < ../../patches/check-rsync.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

14
patches/check-rsync.patch
View file

@ -1,14 +0,0 @@
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index e7314b253b58..5045fabdfbde 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -170,9 +170,6 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
$(eval $(call SetupHostCommand,file,Please install the 'file' package, \
file --version 2>&1 | grep file))
-$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \
- rsync --version </dev/null))
-
$(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
mkdir -p $(dir $@)
$(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $<