From 5cf265f18c45f9f21edc2f614d67e0c82f4b1c67 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 5 Apr 2021 03:39:20 +0800
Subject: [PATCH] Revert "Update build.sh"

This reverts commit 07807828265c575ca447cd986e39ec0f0db24195.
---
 build.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index ff658590..9d83bf58 100755
--- a/build.sh
+++ b/build.sh
@@ -207,6 +207,9 @@ 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 [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then
 	# We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target
@@ -336,13 +339,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"
@@ -424,7 +420,7 @@ if [ "$OMR_KERNEL" = "5.4" ]; then
 	echo "Set to kernel 5.4 for mediatek arch (BPI-R2)"
 	find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
 	echo "Done"
-    echo "Set to kernel 5.4 for IPQ (4019)"
+	echo "Set to kernel 5.4 for IPQ (4019)"
 	find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
 	echo "Done"
 fi
@@ -447,6 +443,7 @@ cd "$OMR_TARGET/source"
 echo "Update feeds index"
 cp .config .config.keep
 scripts/feeds clean
+scripts/feeds install -a
 scripts/feeds update -a
 
 #cd -
@@ -479,4 +476,4 @@ fi
 echo "Building $OMR_DIST for the target $OMR_TARGET"
 make defconfig
 make IGNORE_ERRORS=m "$@"
-echo "Done"
\ No newline at end of file
+echo "Done"