NoaSoftware
/
TencentOS-kernel
forked from TencentOS/TencentOS-kernel
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #280 from Tencent/tk4/katrinzhou-fixpack 

package: support tag startswith x86
This commit is contained in:
sclaibin 2022-09-23 16:06:09 +08:00 committed by GitHub
parent 297ab14805 27a914a699
commit e88965af0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/arm/generate-rpms.sh
View File

@ -82,6 +82,7 @@ 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"

4
package/arm/repackage/generate-rpms.sh
View File

@ -55,7 +55,8 @@ usage()
get_kernel_version()
{
kernel_version=`echo $tag_name|cut -d- -f1`
tagged_name=${tag_name#arm64-}
kernel_version=`echo $tagged_name|cut -d- -f1`
#kernel_version=${kernel_version}-1
#echo "kernel version: $kernel_version"
echo "kernel version: ${kernel_version}"
@ -74,6 +75,7 @@ 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"

3
package/default/generate-rpms.sh
View File

@ -83,6 +83,7 @@ get_tlinux_name()
exit 1
fi
tagged_name=${tagged_name#x86-}
echo "${tagged_name}" | grep 'kasan'
if [ $? -eq 0 ]; then
kasan=1
@ -297,7 +298,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}/ ${tagged_name} | (cd ${build_srcdir} && tar xf -)
git archive --format=tar --prefix=${kernel_full_name}/ ${tag_name} | (cd ${build_srcdir} && tar xf -)
if [ $? -ne 0 ];then
echo "Error:can't prepare $kernel_full_name source with git archive!"
exit 1

4
package/default/repackage/generate-rpms.sh
View File

@ -30,7 +30,8 @@ kernel_default_types=(default)
get_kernel_version()
{
kernel_version=`echo $tag_name|cut -d- -f1`
tagged_name=${tag_name#x86-}
kernel_version=`echo $tagged_name|cut -d- -f1`
#kernel_version=${kernel_version}-1
#echo "kernel version: $kernel_version"
echo "kernel version: ${kernel_version}"
@ -49,6 +50,7 @@ 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