From 9beb448b5eb9146b4e043bdef916daf3c243963f Mon Sep 17 00:00:00 2001
From: suyuan168 <175338101@qq.com>
Date: Thu, 30 Dec 2021 17:53:02 +0800
Subject: [PATCH] Update build.sh

---
 build.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/build.sh b/build.sh
index af8c10b3..6c87a625 100755
--- a/build.sh
+++ b/build.sh
@@ -186,24 +186,6 @@ fi
 #src/gz openwrt_routing http://downloads.openwrt.org/releases/18.06.0/packages/${OMR_REAL_TARGET}/routing
 #src/gz openwrt_telephony http://downloads.openwrt.org/releases/18.06.0/packages/${OMR_REAL_TARGET}/telephony
 #EOF
-
-if [ -f "$OMR_TARGET_CONFIG" ]; then
-	cat "$OMR_TARGET_CONFIG" config -> "$OMR_TARGET/source/.config" <<-EOF
-	CONFIG_IMAGEOPT=y
-	CONFIG_VERSIONOPT=y
-	CONFIG_VERSION_DIST="$OMR_DIST"
-	CONFIG_VERSION_REPO="$OMR_REPO"
-	CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)"
-	EOF
-else
-	cat config -> "$OMR_TARGET/source/.config" <<-EOF
-	CONFIG_IMAGEOPT=y
-	CONFIG_VERSIONOPT=y
-	CONFIG_VERSION_DIST="$OMR_DIST"
-	CONFIG_VERSION_REPO="$OMR_REPO"
-	CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)-$(git -C "$OMR_FEED" rev-parse --short HEAD)"
-	EOF
-fi
 #if [ "$OMR_KERNEL" = "5.14" ]; then
 #	echo 'CONFIG_KERNEL_GIT_CLONE_URI="https://github.com/multipath-tcp/mptcp_net-next.git"' >> "$OMR_TARGET/source/.config"
 #	echo 'CONFIG_KERNEL_GIT_REF="78828adaef8fe9b69f9a8c4b60f74b01c5a31c7a"' >> "$OMR_TARGET/source/.config"
@@ -657,6 +639,24 @@ else
 	scripts/feeds install -a -d y -f -p openmptcprouter
 fi
 cp .config.keep .config
+
+if [ -f "$OMR_TARGET_CONFIG" ]; then
+	cat "$OMR_TARGET_CONFIG" config -> "$OMR_TARGET/source/.config" <<-EOF
+	CONFIG_IMAGEOPT=y
+	CONFIG_VERSIONOPT=y
+	CONFIG_VERSION_DIST="$OMR_DIST"
+	CONFIG_VERSION_REPO="$OMR_REPO"
+	CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)"
+	EOF
+else
+	cat config -> "$OMR_TARGET/source/.config" <<-EOF
+	CONFIG_IMAGEOPT=y
+	CONFIG_VERSIONOPT=y
+	CONFIG_VERSION_DIST="$OMR_DIST"
+	CONFIG_VERSION_REPO="$OMR_REPO"
+	CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)-$(git -C "$OMR_FEED" rev-parse --short HEAD)"
+	EOF
+fi
 scripts/feeds install kmod-macremapper
 echo "Done"