From 6470c4562445405bceabb71fbafc278ee2243f73 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 23 Jun 2021 11:05:41 +0800
Subject: [PATCH] fix

---
 build.sh                       | 19 ++++++-----
 config-bpi-r1                  | 60 ++++++++++++++++++++++++++++++++++
 config-bpi-r2                  |  0
 config-bpi-r64                 |  0
 config-espressobin             |  0
 config-p2w_r619ac              | 13 ++++++++
 config-r2s                     |  0
 config-rpi2                    |  0
 config-rpi3                    |  0
 config-rpi4                    |  0
 config-wrt3200acm              |  0
 config-wrt32x                  |  0
 config-x86                     |  0
 config-x86_64                  |  0
 patches/bbr2.patch             |  0
 patches/check-rsync.patch      |  0
 patches/download-ipv4.patch    |  0
 patches/gtime.patch            |  0
 patches/images.patch           |  0
 patches/ipt-nat6.patch         |  0
 patches/luci-occitan.patch     |  0
 patches/nanqinlang.patch       |  0
 patches/nocheck.patch          |  0
 patches/package-too-long.patch |  0
 patches/remove_abi.patch       | 37 +++++++++++++++++++++
 patches/smsc75xx.patch         |  0
 patches/uefi.patch             |  0
 27 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 config-bpi-r1
 mode change 100755 => 100644 config-bpi-r2
 mode change 100755 => 100644 config-bpi-r64
 mode change 100755 => 100644 config-espressobin
 create mode 100644 config-p2w_r619ac
 mode change 100755 => 100644 config-r2s
 mode change 100755 => 100644 config-rpi2
 mode change 100755 => 100644 config-rpi3
 mode change 100755 => 100644 config-rpi4
 mode change 100755 => 100644 config-wrt3200acm
 mode change 100755 => 100644 config-wrt32x
 mode change 100755 => 100644 config-x86
 mode change 100755 => 100644 config-x86_64
 mode change 100755 => 100644 patches/bbr2.patch
 mode change 100755 => 100644 patches/check-rsync.patch
 mode change 100755 => 100644 patches/download-ipv4.patch
 mode change 100755 => 100644 patches/gtime.patch
 mode change 100755 => 100644 patches/images.patch
 mode change 100755 => 100644 patches/ipt-nat6.patch
 mode change 100755 => 100644 patches/luci-occitan.patch
 mode change 100755 => 100644 patches/nanqinlang.patch
 mode change 100755 => 100644 patches/nocheck.patch
 mode change 100755 => 100644 patches/package-too-long.patch
 create mode 100644 patches/remove_abi.patch
 mode change 100755 => 100644 patches/smsc75xx.patch
 mode change 100755 => 100644 patches/uefi.patch

diff --git a/build.sh b/build.sh
index 1435d587..6f10e513 100755
--- a/build.sh
+++ b/build.sh
@@ -64,9 +64,9 @@ elif [ "$OMR_TARGET" = "rpi4" ]; then
 elif [ "$OMR_TARGET" = "rpi2" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
 elif [ "$OMR_TARGET" = "wrt3200acm" ]; then
-	OMR_REAL_TARGET="arm_cortex-a9_vfpv3"
+	OMR_REAL_TARGET="arm_cortex-a9_vfpv3-d16"
 elif [ "$OMR_TARGET" = "wrt32x" ]; then
-	OMR_REAL_TARGET="arm_cortex-a9_vfpv3"
+	OMR_REAL_TARGET="arm_cortex-a9_vfpv3-d16"
 elif [ "$OMR_TARGET" = "bpi-r1" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
 elif [ "$OMR_TARGET" = "bpi-r2" ]; then
@@ -212,9 +212,6 @@ fi
 if [ "$OMR_PACKAGES" = "mini" ]; then
 	echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config"
 fi
-if [ "$OMR_PACKAGES" = "zuixiao" ]; then
-	echo "CONFIG_PACKAGE_${OMR_DIST}-zuixiao=y" >> "$OMR_TARGET/source/.config"
-fi
 
 if [ "$SHORTCUT_FE" = "yes" ]; then
 	echo "# CONFIG_PACKAGE_kmod-fast-classifier is not set" >> "$OMR_TARGET/source/.config"
@@ -356,6 +353,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" = "r4s" ] || [ "$OMR_TARGET" = "rpi3" ]; then
 	echo "Checking if BBRv2 patch is set or not"
@@ -461,8 +465,8 @@ cd "$OMR_TARGET/source"
 echo "Update feeds index"
 cp .config .config.keep
 scripts/feeds clean
-scripts/feeds install -a
 scripts/feeds update -a
+scripts/feeds install -a
 
 #cd -
 #echo "Checking if fullconenat-luci patch is set or not"
@@ -472,7 +476,6 @@ scripts/feeds update -a
 #fi
 #echo "Done"
 #cd "$OMR_TARGET/source"
-
 if [ "$OMR_ALL_PACKAGES" = "yes" ]; then
 	scripts/feeds install -a -d m -p packages
 	scripts/feeds install -a -d m -p luci
@@ -495,4 +498,4 @@ fi
 echo "Building $OMR_DIST for the target $OMR_TARGET"
 make defconfig
 make IGNORE_ERRORS=m "$@"
-echo "Done"
+echo "Done"
\ No newline at end of file
diff --git a/config-bpi-r1 b/config-bpi-r1
new file mode 100644
index 00000000..56321973
--- /dev/null
+++ b/config-bpi-r1
@@ -0,0 +1,60 @@
+CONFIG_TARGET_BOARD="sunxi"
+CONFIG_TARGET_sunxi=y
+CONFIG_TARGET_sunxi_cortexa7=y
+CONFIG_TARGET_sunxi_cortexa7_DEVICE_lamobo_lamobo-r1=y
+CONFIG_TARGET_SUBTARGET="cortexa7"
+CONFIG_TARGET_PROFILE="DEVICE_lamobo_lamobo-r1"
+CONFIG_TARGET_ROOTFS_EXT4FS=y
+CONFIG_TARGET_ROOTFS_SQUASHFS=y
+CONFIG_PACKAGE_u-boot-Lamobo_R1=y
+CONFIG_PACKAGE_uboot-envtools=y
+CONFIG_PACKAGE_attr=y
+CONFIG_PACKAGE_f2fs-tools=y
+CONFIG_PACKAGE_f2fsck=y
+CONFIG_PACKAGE_mkf2fs=y
+CONFIG_PACKAGE_rtl8188eu-firmware=y
+CONFIG_PACKAGE_ath9k-htc-firmware=y
+CONFIG_PACKAGE_mt7601u-firmware=y
+CONFIG_PACKAGE_rt2800-usb-firmware=y
+CONFIG_PACKAGE_rtl8192cu-firmware=y
+CONFIG_PACKAGE_rtl8192su-firmware=y
+CONFIG_PACKAGE_kmod-switch-bcm53xx=y
+CONFIG_PACKAGE_kmod-switch-bcm53xx-mdio=y
+CONFIG_PACKAGE_ip-bridge=y
+CONFIG_PACKAGE_swconfig=y
+CONFIG_PACKAGE_kmod-swconfig=y
+CONFIG_PACKAGE_kmod-ste10xp=y
+CONFIG_PACKAGE_kmod-can-bcm=y
+CONFIG_PACKAGE_kmod-ata-sunxi=y
+CONFIG_PACKAGE_kmod-rtl8192cu=y
+CONFIG_PACKAGE_kmod-ath9k-common=y
+CONFIG_PACKAGE_kmod-ath9k-htc=y
+CONFIG_PACKAGE_kmod-net-rtl8192su=y
+CONFIG_PACKAGE_kmod-rtl8192c-common=y
+CONFIG_PACKAGE_kmod-rtl8192cu=y
+CONFIG_PACKAGE_kmod-rtl8xxxu=y
+CONFIG_PACKAGE_kmod-sunxi-ir=y
+CONFIG_PACKAGE_kmod-sound-soc-sunxi=y
+CONFIG_PACKAGE_kmod-rtlwifi-usb=y
+CONFIG_PACKAGE_kmod-rtlwifi=y
+CONFIG_PACKAGE_kmod-scsi-core=y
+CONFIG_PACKAGE_kmod-slhc=y
+CONFIG_PACKAGE_kmod-usb-core=y
+CONFIG_PACKAGE_kmod-leds-gpio=y
+CONFIG_PACKAGE_kmod-ledtrig-activity=y
+CONFIG_PACKAGE_kmod-ledtrig-gpio=y
+CONFIG_PACKAGE_kmod-ledtrig-oneshot=y
+CONFIG_PACKAGE_kmod-ledtrig-transient=y
+CONFIG_PACKAGE_kmod-ledtrig-disk=y
+CONFIG_PACKAGE_kmod-ledtrig-mtd=y
+CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
+CONFIG_PACKAGE_kmod-ledtrig-backlight=y
+CONFIG_PACKAGE_kmod-ledtrig-cpu=y
+CONFIG_PACKAGE_kmod-ledtrig-panic=y
+CONFIG_PACKAGE_kmod-ledtrig-netdev=y
+CONFIG_PACKAGE_kmod-ledtrig-pattern=y
+CONFIG_PACKAGE_kmod-ledtrig-audio=y
+CONFIG_PACKAGE_kmod-ipt-led=y
+CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=y
+# CONFIG_PACKAGE_kmod-r8125 is not set
+CONFIG_KERNEL_ARM_MODULE_PLTS=y
diff --git a/config-bpi-r2 b/config-bpi-r2
old mode 100755
new mode 100644
diff --git a/config-bpi-r64 b/config-bpi-r64
old mode 100755
new mode 100644
diff --git a/config-espressobin b/config-espressobin
old mode 100755
new mode 100644
diff --git a/config-p2w_r619ac b/config-p2w_r619ac
new file mode 100644
index 00000000..3ce74bfc
--- /dev/null
+++ b/config-p2w_r619ac
@@ -0,0 +1,13 @@
+CONFIG_TARGET_ipq40xx=y
+CONFIG_TARGET_ipq40xx_generic=y
+CONFIG_TARGET_ipq40xx_generic_DEVICE_p2w_r619ac-128m=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
+CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y
+CONFIG_DEFAULT_kmod-ath10k-ct=y
+CONFIG_PACKAGE_kmod-ath10k-ct=y
+CONFIG_ATH10K-CT_LEDS=y
+CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y
+CONFIG_KERNEL_ARM_MODULE_PLTS=y 
diff --git a/config-r2s b/config-r2s
old mode 100755
new mode 100644
diff --git a/config-rpi2 b/config-rpi2
old mode 100755
new mode 100644
diff --git a/config-rpi3 b/config-rpi3
old mode 100755
new mode 100644
diff --git a/config-rpi4 b/config-rpi4
old mode 100755
new mode 100644
diff --git a/config-wrt3200acm b/config-wrt3200acm
old mode 100755
new mode 100644
diff --git a/config-wrt32x b/config-wrt32x
old mode 100755
new mode 100644
diff --git a/config-x86 b/config-x86
old mode 100755
new mode 100644
diff --git a/config-x86_64 b/config-x86_64
old mode 100755
new mode 100644
diff --git a/patches/bbr2.patch b/patches/bbr2.patch
old mode 100755
new mode 100644
diff --git a/patches/check-rsync.patch b/patches/check-rsync.patch
old mode 100755
new mode 100644
diff --git a/patches/download-ipv4.patch b/patches/download-ipv4.patch
old mode 100755
new mode 100644
diff --git a/patches/gtime.patch b/patches/gtime.patch
old mode 100755
new mode 100644
diff --git a/patches/images.patch b/patches/images.patch
old mode 100755
new mode 100644
diff --git a/patches/ipt-nat6.patch b/patches/ipt-nat6.patch
old mode 100755
new mode 100644
diff --git a/patches/luci-occitan.patch b/patches/luci-occitan.patch
old mode 100755
new mode 100644
diff --git a/patches/nanqinlang.patch b/patches/nanqinlang.patch
old mode 100755
new mode 100644
diff --git a/patches/nocheck.patch b/patches/nocheck.patch
old mode 100755
new mode 100644
diff --git a/patches/package-too-long.patch b/patches/package-too-long.patch
old mode 100755
new mode 100644
diff --git a/patches/remove_abi.patch b/patches/remove_abi.patch
new file mode 100644
index 00000000..c97a9066
--- /dev/null
+++ b/patches/remove_abi.patch
@@ -0,0 +1,37 @@
+--- 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
diff --git a/patches/smsc75xx.patch b/patches/smsc75xx.patch
old mode 100755
new mode 100644
diff --git a/patches/uefi.patch b/patches/uefi.patch
old mode 100755
new mode 100644