From e106585ab951dd902ebef16d5346d7a7048ce65a Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Sat, 20 Feb 2021 22:23:41 +0800
Subject: [PATCH] fix remove_abi.patch

---
 build.sh                 |  7 -------
 patches/remove_abi.patch | 37 -------------------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 patches/remove_abi.patch

diff --git a/build.sh b/build.sh
index 2d6b554a..c7eeed78 100755
--- a/build.sh
+++ b/build.sh
@@ -239,13 +239,6 @@ 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"
diff --git a/patches/remove_abi.patch b/patches/remove_abi.patch
deleted file mode 100644
index c97a9066..00000000
--- a/patches/remove_abi.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/package/libs/libubox/Makefile	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
---- a/package/system/ubus/Makefile	2021-02-17 15:16:34.450301703 +0100
-+++ b/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