From a7a201698375460d5dc1fd24aebebcb01ab2071d Mon Sep 17 00:00:00 2001
From: KatrinJo <zys.zljxml@gmail.com>
Date: Sat, 24 Sep 2022 19:26:28 +0800
Subject: [PATCH] Revert "package: support tag startswith x86"

---
 package/arm/generate-rpms.sh               | 1 -
 package/arm/repackage/generate-rpms.sh     | 4 +---
 package/default/generate-rpms.sh           | 3 +--
 package/default/repackage/generate-rpms.sh | 4 +---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/arm/generate-rpms.sh b/package/arm/generate-rpms.sh
index 3a72b81ae..fa7ac86e4 100755
--- a/package/arm/generate-rpms.sh
+++ b/package/arm/generate-rpms.sh
@@ -80,7 +80,6 @@ get_tlinux_name()
 		exit 1
 	fi
 
-	tagged_name=${tagged_name#arm64-}
 	echo "${tagged_name}" | grep 'kvm_guest'
 	if [ $? -eq 0 ]; then
 		echo "start kvm guest build"
diff --git a/package/arm/repackage/generate-rpms.sh b/package/arm/repackage/generate-rpms.sh
index cbc8bfac7..5a9ee2e1f 100755
--- a/package/arm/repackage/generate-rpms.sh
+++ b/package/arm/repackage/generate-rpms.sh
@@ -55,8 +55,7 @@ usage()
 
 get_kernel_version()
 {
-	tagged_name=${tag_name#arm64-}
-	kernel_version=`echo $tagged_name|cut -d- -f1`
+	kernel_version=`echo $tag_name|cut -d- -f1`
 	#kernel_version=${kernel_version}-1
 	#echo "kernel version: $kernel_version"
 	echo "kernel version: ${kernel_version}"
@@ -75,7 +74,6 @@ get_tlinux_name()
 		exit 1
 	fi
 
-	tagged_name=${tagged_name#arm64-}
 	echo "${tagged_name}" | grep 'kvm_guest'
 	if [ $? -eq 0 ]; then
 		echo "start kvm guest build"
diff --git a/package/default/generate-rpms.sh b/package/default/generate-rpms.sh
index def039ca2..4290b4d63 100755
--- a/package/default/generate-rpms.sh
+++ b/package/default/generate-rpms.sh
@@ -81,7 +81,6 @@ get_tlinux_name()
 		exit 1
 	fi
 
-	tagged_name=${tagged_name#x86-}
 	echo "${tagged_name}" | grep 'kasan'
 	if [ $?  -eq 0 ]; then
 		kasan=1
@@ -235,7 +234,7 @@ if test -e ${build_srcdir}/${kernel_full_name}; then
 fi
 
 #tagged_name is a confirmed tag name and will be used for final source.
-git archive --format=tar --prefix=${kernel_full_name}/ ${tag_name} | (cd ${build_srcdir} && tar xf  -)
+git archive --format=tar --prefix=${kernel_full_name}/ ${tagged_name} | (cd ${build_srcdir} && tar xf  -)
 if [ $? -ne 0 ];then
 	echo "Error:can't prepare $kernel_full_name source with git archive!"
 	exit 1
diff --git a/package/default/repackage/generate-rpms.sh b/package/default/repackage/generate-rpms.sh
index b62e13e0d..4881b1669 100755
--- a/package/default/repackage/generate-rpms.sh
+++ b/package/default/repackage/generate-rpms.sh
@@ -30,8 +30,7 @@ kernel_default_types=(default)
 
 get_kernel_version()
 {
-	tagged_name=${tag_name#x86-}
-	kernel_version=`echo $tagged_name|cut -d- -f1`
+	kernel_version=`echo $tag_name|cut -d- -f1`
 	#kernel_version=${kernel_version}-1
 	#echo "kernel version: $kernel_version"
 	echo "kernel version: ${kernel_version}"
@@ -50,7 +49,6 @@ get_tlinux_name()
 		exit 1
 	fi
 
-	tagged_name=${tagged_name#x86-}
 	#if [ "${tagged_name#*-*-*}" != ${tagged_name} ];then
 		#echo "Error: bad tag name:$tagged_name."
 		#exit 1