From d98f6418929d79b5e748c519763e6ad920d4ef68 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 23 Nov 2022 15:55:36 +0800
Subject: [PATCH] Revert "Update build.sh"

This reverts commit 1f9a96f6bb4070dcc890f45edf04b026b3906512.
---
 build.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 8dc8d658..19e4599a 100644
--- a/build.sh
+++ b/build.sh
@@ -143,9 +143,15 @@ rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/files" "$OMR_TARGET/${OMR_KERNEL}/sourc
 #rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek"
 rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/tools/firmware-utils"
 rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-rockchip"
-
-cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source"
-
+if [ "$OMR_TARGET" != "rutx" ]; then
+	# There is many customization to support rutx and this seems to break other ipq40xx, so dirty workaround for now
+	mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old"
+	cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source"
+	rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx"
+	mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx"
+else
+	cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source"
+fi
 
 cat >> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" <<EOF
 -----------------------------------------------------
@@ -639,7 +645,7 @@ fi
 cd ../..
 [ -d $OMR_FEED/luci-base/po/oc ] && cp -rf $OMR_FEED/luci-base/po/oc feeds/${OMR_KERNEL}/luci/modules/luci-base/po/
 echo "Done"
-chmod -R 777 "$OMR_TARGET/${OMR_KERNEL}/source"
+
 cd "$OMR_TARGET/${OMR_KERNEL}/source"
 echo "Update feeds index"
 cp .config .config.keep
@@ -665,7 +671,6 @@ if [ -n "$CUSTOM_FEED" ]; then
 else
 	scripts/feeds install -a -d y -f -p openmptcprouter
 fi
-scripts/feeds install -a
 cp .config.keep .config
 scripts/feeds install kmod-macremapper
 echo "Done"