From 628a26ba3bddef25e7e60a6cb2966157fcd4466f Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 5 Apr 2021 13:51:55 +0800
Subject: [PATCH] fix build.sh

---
 build.sh |  21 ++---
 config1  | 256 -------------------------------------------------------
 2 files changed, 8 insertions(+), 269 deletions(-)
 delete mode 100644 config1

diff --git a/build.sh b/build.sh
index 77d0b8d9..439aa39c 100755
--- a/build.sh
+++ b/build.sh
@@ -62,10 +62,6 @@ elif [ "$OMR_TARGET" = "rpi4" ]; then
 	OMR_REAL_TARGET="aarch64_cortex-a72"
 elif [ "$OMR_TARGET" = "rpi2" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
-elif [ "$OMR_TARGET" = "4018" ]; then
-	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
-elif [ "$OMR_TARGET" = "4019" ]; then
-	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
 elif [ "$OMR_TARGET" = "wrt3200acm" ]; then
 	OMR_REAL_TARGET="arm_cortex-a9_vfpv3-d16"
 elif [ "$OMR_TARGET" = "wrt32x" ]; then
@@ -207,9 +203,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 [ "$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
@@ -339,6 +332,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"
@@ -420,9 +420,6 @@ 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)"
-	find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
-	echo "Done"
 fi
 
 #rm -rf feeds/packages/libs/libwebp
@@ -443,9 +440,7 @@ 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 update -a && ./scripts/feeds install -a
 
 #cd -
 #echo "Checking if fullconenat-luci patch is set or not"
@@ -477,4 +472,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/config1 b/config1
deleted file mode 100644
index 7b627e04..00000000
--- a/config1
+++ /dev/null
@@ -1,256 +0,0 @@
-CONFIG_DEVEL=y
-CONFIG_TOOLCHAINOPTS=y
-CONFIG_ALL_KMODS=y
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ARP=y
-CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_BUSYBOX_CONFIG_BASE64=y
-CONFIG_BUSYBOX_CONFIG_BC=y
-CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
-CONFIG_BUSYBOX_CONFIG_DELUSER=y
-CONFIG_BUSYBOX_CONFIG_DIFF=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=32
-CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
-CONFIG_BUSYBOX_CONFIG_IOSTAT=y
-CONFIG_BUSYBOX_CONFIG_LOADKMAP=y
-CONFIG_BUSYBOX_CONFIG_LSPCI=y
-CONFIG_BUSYBOX_CONFIG_LSUSB=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_PKILL=y
-CONFIG_BUSYBOX_CONFIG_STAT=y
-CONFIG_BUSYBOX_CONFIG_STTY=y
-CONFIG_BUSYBOX_CONFIG_TELNET=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_WATCH=y
-# CONFIG_GDB is not set
-CONFIG_GRUB_SERIAL=""
-CONFIG_GRUB_TIMEOUT="0"
-CONFIG_GRUB_TITLE="OpenMPTCProuter"
-CONFIG_KERNEL_AIO=y
-CONFIG_KERNEL_DEBUG_GPIO=y
-# CONFIG_KERNEL_DEBUG_INFO is not set
-CONFIG_KERNEL_DEBUG_PINCTRL=y
-CONFIG_KERNEL_DEVTMPFS=y
-CONFIG_KERNEL_DEVTMPFS_MOUNT=y
-CONFIG_KERNEL_DIRECT_IO=y
-CONFIG_KERNEL_DMA_ACPI=y
-CONFIG_KERNEL_FANOTIFY=y
-CONFIG_KERNEL_FHANDLE=y
-CONFIG_KERNEL_IPC_NS=y
-# CONFIG_KERNEL_MAGIC_SYSRQ is not set
-CONFIG_KERNEL_MMC_SDHCI_ACPI=y
-CONFIG_KERNEL_NAMESPACES=y
-CONFIG_KERNEL_NET_NS=y
-CONFIG_KERNEL_PID_NS=y
-# CONFIG_KERNEL_SWAP is not set
-CONFIG_KERNEL_USER_NS=y
-CONFIG_KERNEL_UTS_NS=y
-# CONFIG_PACKAGE_dnsmasq is not set
-CONFIG_PACKAGE_kmod-8021q=y
-CONFIG_PACKAGE_kmod-ata-ahci=y
-CONFIG_PACKAGE_kmod-ata-core=y
-CONFIG_PACKAGE_kmod-block2mtd=y
-CONFIG_PACKAGE_kmod-bridge=y
-CONFIG_PACKAGE_kmod-crypto-gcm=y
-CONFIG_PACKAGE_kmod-gpio-button-hotplug=y
-CONFIG_PACKAGE_kmod-hid=y
-CONFIG_PACKAGE_kmod-hid-generic=y
-CONFIG_PACKAGE_kmod-i2c-gpio=y
-CONFIG_PACKAGE_kmod-i2c-gpio-custom=y
-CONFIG_PACKAGE_kmod-ifb=y
-CONFIG_PACKAGE_kmod-ikconfig=y
-CONFIG_PACKAGE_kmod-input-evdev=y
-CONFIG_PACKAGE_kmod-loop=y
-CONFIG_PACKAGE_kmod-macvlan=y
-CONFIG_PACKAGE_kmod-mmc=y
-CONFIG_PACKAGE_kmod-mmc-spi=y
-CONFIG_PACKAGE_kmod-random-core=y
-CONFIG_DEFAULT_kmod-r8169=y
-CONFIG_PACKAGE_kmod-scsi-core=y
-CONFIG_PACKAGE_kmod-sctp=y
-CONFIG_PACKAGE_kmod-sdhci=y
-CONFIG_PACKAGE_kmod-serial-8250=y
-CONFIG_PACKAGE_kmod-stp=y
-CONFIG_PACKAGE_kmod-usb-acm=y
-CONFIG_PACKAGE_kmod-usb-core=y
-CONFIG_PACKAGE_kmod-usb-hid=y
-CONFIG_PACKAGE_kmod-usb-net=y
-CONFIG_PACKAGE_kmod-usb-net-asix=y
-CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y
-CONFIG_PACKAGE_kmod-usb-net-dm9601-ether=y
-CONFIG_PACKAGE_kmod-usb-net-hso=y
-CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y
-CONFIG_PACKAGE_kmod-usb-net-ipheth=y
-CONFIG_PACKAGE_kmod-usb-net-kalmia=y
-CONFIG_PACKAGE_kmod-usb-net-kaweth=y
-CONFIG_PACKAGE_kmod-usb-net-mcs7830=y
-CONFIG_PACKAGE_kmod-usb-net-pegasus=y
-CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y
-CONFIG_PACKAGE_kmod-usb-net-rndis=y
-CONFIG_PACKAGE_kmod-usb-net-rtl8150=y
-CONFIG_PACKAGE_kmod-usb-net-rtl8152=y
-CONFIG_PACKAGE_kmod-usb-net-sierrawireless=y
-CONFIG_PACKAGE_kmod-usb-net-smsc95xx=y
-CONFIG_PACKAGE_kmod-usb-net-sr9700=y
-CONFIG_PACKAGE_kmod-usb-serial=y
-CONFIG_PACKAGE_kmod-usb-serial-ark3116=y
-CONFIG_PACKAGE_kmod-usb-serial-belkin=y
-CONFIG_PACKAGE_kmod-usb-serial-ch341=y
-CONFIG_PACKAGE_kmod-usb-serial-cp210x=y
-CONFIG_PACKAGE_kmod-usb-serial-cypress-m8=y
-CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
-CONFIG_PACKAGE_kmod-usb-serial-garmin=y
-CONFIG_PACKAGE_kmod-usb-serial-ipw=y
-CONFIG_PACKAGE_kmod-usb-serial-keyspan=y
-CONFIG_PACKAGE_kmod-usb-serial-mct=y
-CONFIG_PACKAGE_kmod-usb-serial-mos7720=y
-CONFIG_PACKAGE_kmod-usb-serial-option=y
-CONFIG_PACKAGE_kmod-usb-serial-oti6858=y
-CONFIG_PACKAGE_kmod-usb-serial-pl2303=y
-CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y
-CONFIG_PACKAGE_kmod-usb-serial-sierrawireless=y
-CONFIG_PACKAGE_kmod-usb-serial-simple=y
-CONFIG_PACKAGE_kmod-usb-serial-ti-usb=y
-CONFIG_PACKAGE_kmod-usb-serial-visor=y
-CONFIG_PACKAGE_kmod-usb-serial-wwan=y
-CONFIG_PACKAGE_kmod-usb-storage=y
-CONFIG_PACKAGE_kmod-usb-wdm=y
-CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-usb3=y
-CONFIG_PACKAGE_kmod-veth=y
-CONFIG_PACKAGE_kmod-3c59x=y
-CONFIG_PACKAGE_kmod-8139cp=y
-CONFIG_PACKAGE_kmod-8139too=y
-CONFIG_PACKAGE_kmod-atl1=y
-CONFIG_PACKAGE_kmod-atl1c=y
-CONFIG_PACKAGE_kmod-atl1e=y
-CONFIG_PACKAGE_kmod-atl2=y
-CONFIG_PACKAGE_kmod-b44=y
-CONFIG_PACKAGE_kmod-bnx2=y
-CONFIG_PACKAGE_kmod-dm9000=y
-CONFIG_PACKAGE_kmod-e100=y
-CONFIG_PACKAGE_kmod-e1000=y
-CONFIG_PACKAGE_kmod-e1000e=y
-CONFIG_PACKAGE_kmod-et131x=y
-CONFIG_PACKAGE_kmod-ethoc=y
-CONFIG_PACKAGE_kmod-forcedeth=y
-CONFIG_PACKAGE_kmod-gigaset=y
-CONFIG_PACKAGE_kmod-hfcmulti=y
-CONFIG_PACKAGE_kmod-hfcpci=y
-CONFIG_PACKAGE_kmod-natsemi=y
-CONFIG_PACKAGE_kmod-ne2k-pci=y
-CONFIG_PACKAGE_kmod-of-mdio=y
-CONFIG_PACKAGE_kmod-pcnet32=y
-CONFIG_PACKAGE_kmod-phy-broadcom=y
-CONFIG_PACKAGE_kmod-ppfe=y
-CONFIG_PACKAGE_kmod-r6040=y
-CONFIG_PACKAGE_kmod-r8169=y
-CONFIG_PACKAGE_kmod-sis190=y
-CONFIG_PACKAGE_kmod-sis900=y
-CONFIG_PACKAGE_kmod-skge=y
-CONFIG_PACKAGE_kmod-sky2=y
-CONFIG_PACKAGE_kmod-solos-pci=y
-CONFIG_PACKAGE_kmod-spi-ks8995=y
-CONFIG_PACKAGE_kmod-tg3=y
-CONFIG_PACKAGE_kmod-tulip=y
-CONFIG_PACKAGE_kmod-via-rhine=y
-CONFIG_PACKAGE_kmod-via-velocity=y
-CONFIG_PACKAGE_kmod-vmxnet3=y
-CONFIG_PACKAGE_kmod-fs-vfat=y
-CONFIG_PACKAGE_kmod-macremapper=m
-CONFIG_TARGET_IMAGES_PAD=y
-CONFIG_TARGET_ROOTFS_EXT4=y
-CONFIG_KERNEL_TCP_CONG_CDG=y
-CONFIG_KERNEL_TCP_CONG_HTCP=y
-CONFIG_KERNEL_TCP_CONG_HSTCP=y
-CONFIG_KERNEL_TCP_CONG_HYBLA=y
-CONFIG_KERNEL_TCP_CONG_ILLINOIS=y
-CONFIG_KERNEL_TCP_CONG_SCALABLE=y
-CONFIG_KERNEL_TCP_CONG_VEGAS=y
-CONFIG_KERNEL_TCP_CONG_VENO=y
-CONFIG_KERNEL_TCP_CONG_WESTWOOD=y
-CONFIG_KERNEL_TCP_CONG_YEAH=y
-CONFIG_KERNEL_TCP_CONG_LIA=y
-CONFIG_KERNEL_TCP_CONG_BBR=y
-CONFIG_KERNEL_TCP_CONG_NANQINLANG=y
-CONFIG_KERNEL_TCP_CONG_OLIA=y
-CONFIG_KERNEL_TCP_CONG_WVEGAS=y
-CONFIG_KERNEL_TCP_CONG_BALIA=y
-CONFIG_KERNEL_MPTCP_FULLMESH=y
-CONFIG_KERNEL_DEFAULT_FULLMESH=y
-CONFIG_KERNEL_MPTCP_NDIFFPORTS=y
-# CONFIG_KERNEL_DEFAULT_NDIFFPORTS is not set
-CONFIG_KERNEL_MPTCP_BINDER=y
-CONFIG_KERNEL_MPTCP_ECF=y
-# CONFIG_KERNEL_DEFAULT_BINDER is not set
-# CONFIG_KERNEL_DEFAULT_DUMMY is not set
-CONFIG_KERNEL_MPTCP_ROUNDROBIN=y
-# CONFIG_KERNEL_DEFAULT_ROUNDROBIN is not set
-CONFIG_KERNEL_MPTCP_REDUNDANT=y
-# CONFIG_KERNEL_DEFAULT_REDUNDANT is not set
-CONFIG_KERNEL_DEFAULT_SCHEDULER=y
-CONFIG_KERNEL_MPTCP=y
-CONFIG_KERNEL_CRYPTO_SHA256=y
-CONFIG_LUCI_LANG_hu=y
-CONFIG_LUCI_LANG_pt=y
-CONFIG_LUCI_LANG_sk=y
-CONFIG_LUCI_LANG_ro=y
-CONFIG_LUCI_LANG_en=y
-CONFIG_LUCI_LANG_pl=y
-CONFIG_LUCI_LANG_uk=y
-CONFIG_LUCI_LANG_ja=y
-CONFIG_LUCI_LANG_vi=y
-CONFIG_LUCI_LANG_de=y
-CONFIG_LUCI_LANG_no=y
-CONFIG_LUCI_LANG_ms=y
-CONFIG_LUCI_LANG_zh_Hans=y
-CONFIG_LUCI_LANG_zh_Hant=y
-CONFIG_LUCI_LANG_ko=y
-CONFIG_LUCI_LANG_he=y
-CONFIG_LUCI_LANG_zh-tw=y
-CONFIG_LUCI_LANG_tr=y
-CONFIG_LUCI_LANG_sv=y
-CONFIG_LUCI_LANG_ru=y
-CONFIG_LUCI_LANG_el=y
-CONFIG_LUCI_LANG_ca=y
-CONFIG_LUCI_LANG_es=y
-CONFIG_LUCI_LANG_pt_BR=y
-CONFIG_LUCI_LANG_cs=y
-CONFIG_LUCI_LANG_fr=y
-CONFIG_LUCI_LANG_it=y
-CONFIG_LUCI_LANG_ar=y
-CONFIG_LUCI_LANG_bg=y
-CONFIG_LUCI_LANG_bn_BD=y
-CONFIG_LUCI_LANG_fi=y
-CONFIG_LUCI_LANG_hi=y
-CONFIG_LUCI_LANG_mr=y
-CONFIG_LUCI_LANG_nb_NO=y
-CONFIG_TARGET_ROOTFS_PARTSIZE=512
-CONFIG_TARGET_KERNEL_PARTSIZE=64
-CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
-# CONFIG_LUCI_CSSTIDY is not set
-# CONFIG_LIBCURL_WOLFSSL is not set
-# CONFIG_PACKAGE_libustream-wolfssl is not set
-CONFIG_KERNEL_DEVMEM=y
-CONFIG_KERNEL_DEVKMEM=y
-CONFIG_AUTOREMOVE=y