From a229175272104d85ef57c3718db941b1424e5403 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Fri, 10 Mar 2023 15:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Ubuntu=E5=92=8CDebian?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=90=8D=E7=A7=B0=E5=8C=B9=E9=85=8D=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/build.sh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/common/build.sh b/common/build.sh
index a2f7c0a..18649b0 100755
--- a/common/build.sh
+++ b/common/build.sh
@@ -901,18 +901,16 @@ function build_ubuntu(){
 	cd ubuntu
 
 
-	if [ ! -e ubuntu-rootfs.img ]; then
-		echo "[ No ubuntu-rootfs.img, Run Make Ubuntu Scripts ]"
-		if [ ! -e ubuntu-base-$RK_ROOTFS_TARGET-$ARCH.tar.gz ]; then
+	if [ ! -e ubuntu-$RK_ROOTFS_TARGET-rootfs.img ]; then
+		echo "[ No ubuntu-$RK_ROOTFS_TARGET-rootfs.img, Run Make Ubuntu Scripts ]"
+		if [ ! -e ubuntu-base-$RK_ROOTFS_TARGET-$ARCH-*.tar.gz ]; then
 			ARCH=arm64  ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh
 		fi
 
 		VERSION=$RK_ROOTFS_DEBUG ARCH=$ARCH SOC=$RK_SOC ./mk-$RK_ROOTFS_TARGET-rootfs.sh
-
-		./mk-image.sh
 	else
-		echo "[ Already Exists IMG,   Skip Make Ubuntu Scripts ]"
-		echo "[ Delate ubuntu-rootfs.img To Rebuild Ubuntu IMG ]"
+		echo "[    Already Exists IMG,  Skip Make Ubuntu Scripts    ]"
+		echo "[ Delate Ubuntu-$RK_ROOTFS_TARGET-rootfs.img To Rebuild Ubuntu IMG ]"
 	fi
 
 	finish_build
@@ -941,18 +939,17 @@ function build_debian(){
 		echo -e "\033[36m please input the os type,stretch or buster...... \033[0m"
 	fi
 
-	if [ ! -e linaro-rootfs.img ]; then
-		echo "[ No linaro-rootfs.img, Run Make Debian Scripts ]"
-		if [ ! -e linaro-$RELEASE-alip-*.tar.gz ]; then
-			echo "[ build linaro-$RELEASE-alip-*.tar.gz ]"
+	if [ ! -e linaro-$RK_ROOTFS_TARGET-rootfs.img ]; then
+		echo "[ No linaro-$RK_ROOTFS_TARGET-rootfs.img, Run Make Debian Scripts ]"
+		if [ ! -e linaro-$RELEASE-$RK_ROOTFS_TARGET-alip-*.tar.gz ]; then
+			echo "[ build linaro-$RELEASE-$RK_ROOTFS_TARGET-alip-*.tar.gz ]"
 			RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH ./mk-base-debian.sh
 		fi
 
 		RELEASE=$RELEASE TARGET=$RK_ROOTFS_TARGET VERSION=$RK_ROOTFS_DEBUG SOC=$RK_SOC ARCH=$ARCH ./mk-rootfs.sh
-		./mk-image.sh
 	else
-		echo "[ Already Exists IMG,   Skip Make Debian Scripts ]"
-		echo "[ Delate linaro-rootfs.img To Rebuild Debian IMG ]"
+		echo "[    Already Exists IMG,  Skip Make Debian Scripts    ]"
+		echo "[ Delate linaro-$RK_ROOTFS_TARGET-rootfs.img To Rebuild Debian IMG ]"
 	fi
 
 
@@ -976,12 +973,12 @@ function build_rootfs(){
 			;;
 		ubuntu)
 			build_ubuntu
-			ln -rsf ubuntu/ubuntu-rootfs.img \
+			ln -rsf ubuntu/ubuntu-$RK_ROOTFS_TARGET-rootfs.img \
 				$RK_ROOTFS_DIR/rootfs.ext4
 			;;
 		debian)
 			build_debian
-			ln -rsf debian/linaro-rootfs.img \
+			ln -rsf debian/linaro-$RK_ROOTFS_TARGET-rootfs.img \
 				$RK_ROOTFS_DIR/rootfs.ext4
 			;;
 		*)