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

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-02-17 19:25:29 +01:00
parent be9f7d9080
commit ee50aab248
2 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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 "3bd8f660a4b967a25aa7b605f0ead44ddfab9ea4"
_get_repo feeds/packages https://github.com/openwrt/packages "d2aba09d262177d64806ed3a523b58f8bb0f4384"
_get_repo feeds/luci https://github.com/openwrt/luci "c434b50c7c61ccb53685dd8d6adad45ffe82eb60"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "482c9ff289c65480c8e7340e1740db24c62f91df"
_get_repo feeds/packages https://github.com/openwrt/packages "82ceca2619b0abf882b684599a2d62f45389a28b"
_get_repo feeds/luci https://github.com/openwrt/luci "cb0979ffb242d91f8a478438d27e2f004fb89e59"
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"
@ -236,6 +236,13 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/nanqinlang.patch; then
fi
echo "Done"
echo "Checking if remove_abi patch is set or not"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/remove_abi.patch; then
echo "apply..."
patch -N -p1 -s < ../../patches/remove_abi.patch
fi
echo "Done"
# Add BBR2 patch, only working on 64bits images for now
if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then
echo "Checking if BBRv2 patch is set or not"

37
patches/remove_abi.patch Normal file
View file

@ -0,0 +1,37 @@
--- a/package/libs/libubox/Makefile.anc 2021-02-17 14:45:19.981073050 +0100
+++ b/package/libs/libubox/Makefile 2021-02-17 14:45:57.232466168 +0100
@@ -73,12 +73,12 @@
define Package/libubox/install
$(INSTALL_DIR) $(1)/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so.* $(1)/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
endef
define Package/libblobmsg-json/install
$(INSTALL_DIR) $(1)/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so.* $(1)/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
endef
define Package/jshn/install
@@ -89,7 +89,7 @@
define Package/libjson-script/install
$(INSTALL_DIR) $(1)/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so.* $(1)/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
endef
define Package/libubox-lua/install
--- package/system/ubus/Makefile.anc 2021-02-17 15:16:34.450301703 +0100
+++ package/system/ubus/Makefile 2021-02-17 15:16:55.289957767 +0100
@@ -69,7 +69,7 @@
define Package/libubus/install
$(INSTALL_DIR) $(1)/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so $(1)/lib/
endef
define Package/libubus-lua/install