mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-14 12:21:53 +00:00
Code Issues Releases Wiki Activity

Update openwrt and remove mvebu patch

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-04-17 15:04:15 +02:00
parent e1ff515aac
commit d9b5100b7d
3 changed files with 28 additions and 7729 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build.sh
View file

@ -61,9 +61,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 "02a1914585fffb97b26cc871b303a39ac9d37cbb"
_get_repo feeds/packages https://github.com/openwrt/packages "e086343cb5d0bcda2f85486e56f478987d2ea171"
_get_repo feeds/luci https://github.com/openwrt/luci "1e07e3a52d4d06cc82ab07f2b7fbba0a9a6fb801"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "75ef28be59c5b76d73313cfb9650f464ae943cc8"
_get_repo feeds/packages https://github.com/openwrt/packages "c11aaead910d5351d0f3fd4e4460ad98336fa0d4"
_get_repo feeds/luci https://github.com/openwrt/luci "01d8283ecea730191ce41302acb7ecd1aaf0631f"
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"
@ -200,12 +200,12 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/ipt-nat6.patch; then
fi
echo "Done"
echo "Checking if mvebu patch is set or not"
if [ ! -d target/linux/mvebu/patches-5.4 ]; then
echo "apply..."
patch -N -p1 -s < ../../patches/mvebu-5.14.patch
fi
echo "Done"
#echo "Checking if mvebu patch is set or not"
#if [ ! -d target/linux/mvebu/patches-5.4 ]; then
# echo "apply..."
# patch -N -p1 -s < ../../patches/mvebu-5.14.patch
#fi
#echo "Done"
echo "Checking if opkg install arguement too long patch is set or not"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/package-too-long.patch; then
@ -214,6 +214,12 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/package-too-long.patch; then
fi
echo "Done"
echo "Downlaod via IPv4"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/download-ipv4.patch; then
patch -N -p1 -s < ../../patches/download-ipv4.patch
fi
echo "Done"
#echo "Patch protobuf wrong hash"
#patch -N -R -p1 -s < ../../patches/protobuf_hash.patch

13
patches/download-ipv4.patch Normal file
View file

@ -0,0 +1,13 @@
--- a/scripts/download.pl 2020-04-12 21:41:19.548645048 +0200
+++ b/scripts/download.pl 2020-04-12 21:41:28.752479609 +0200
@@ -82,8 +82,8 @@
}
return $have_curl
- ? (qw(curl -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
- : (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
+ ? (qw(curl -4 -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
+ : (qw(wget -4 --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
;
}

7720
patches/mvebu-5.14.patch
View file

File diff suppressed because it is too large Load diff