isula-build: use vendor instead specific vendor name
Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com> (cherry picked from commit 55784d2a67b661609bd8bf8f045b6e73953aff11)
This commit is contained in:
parent
6e8e53cb88
commit
7c8ed64c22
@ -1 +0,0 @@
|
||||
0.9.5-28
|
||||
1
VERSION-vendor
Normal file
1
VERSION-vendor
Normal file
@ -0,0 +1 @@
|
||||
0.9.5-29
|
||||
@ -9,7 +9,7 @@ set -ex
|
||||
pkg=isula-build
|
||||
cwd=${PWD}
|
||||
src=${cwd}/${pkg}
|
||||
tar_file=v"$(awk -F"-" '{print $1}' < VERSION-openeuler)".tar.gz
|
||||
tar_file=v"$(awk -F"-" '{print $1}' < VERSION-vendor)".tar.gz
|
||||
|
||||
tar -zxvf "${tar_file}"
|
||||
if [ ! -d patch ]; then
|
||||
@ -35,5 +35,5 @@ done <"${series}"
|
||||
cd "${cwd}"
|
||||
|
||||
cp -rf "${src}"/* .
|
||||
cp -f VERSION-openeuler VERSION
|
||||
cp -f VERSION-vendor VERSION
|
||||
rm -rf "${src}"
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
# Basic info
|
||||
top_dir=$(git rev-parse --show-toplevel)
|
||||
version_file="${top_dir}/VERSION-openeuler"
|
||||
version_file="${top_dir}/VERSION-vendor"
|
||||
spec_file="${top_dir}/isula-build.spec"
|
||||
commit_file=${top_dir}/git-commit
|
||||
color=$(tput setaf 2) # red
|
||||
|
||||
@ -1 +1 @@
|
||||
fe7fc24b37d8480402d75a554dfe3475a5424f89
|
||||
7620610754ea50ff5fa5908d01fc069aacdc10f3
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
Name: isula-build
|
||||
Version: 0.9.5
|
||||
Release: 28
|
||||
Release: 29
|
||||
Summary: A tool to build container images
|
||||
License: Mulan PSL V2
|
||||
URL: https://gitee.com/openeuler/isula-build
|
||||
Source0: https://gitee.com/openeuler/isula-build/repository/archive/v%{version}.tar.gz
|
||||
Source1: git-commit
|
||||
Source2: VERSION-openeuler
|
||||
Source2: VERSION-vendor
|
||||
Source3: apply-patches
|
||||
Source4: gen-version.sh
|
||||
Source5: series.conf
|
||||
@ -85,6 +85,12 @@ fi
|
||||
/usr/share/bash-completion/completions/isula-build
|
||||
|
||||
%changelog
|
||||
* Thu Nov 24 2022 Lu Jingxiao <lujingxiao@huawei.com> - 0.9.5-29
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:restart
|
||||
- DESC:use vendor instead specific vendor name
|
||||
|
||||
* Fri Sep 30 2022 jingxiaolu <lujingxiao@huawei.com> - 0.9.5-28
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user