isula-build: use vendor instead specific vendor name
Signed-off-by: DCCooper <1866858@gmail.com>
This commit is contained in:
parent
e23df81bcf
commit
047ff69757
@ -1 +0,0 @@
|
|||||||
0.9.6-13
|
|
||||||
1
VERSION-vendor
Normal file
1
VERSION-vendor
Normal file
@ -0,0 +1 @@
|
|||||||
|
0.9.6-14
|
||||||
@ -9,7 +9,7 @@ set -ex
|
|||||||
pkg=isula-build
|
pkg=isula-build
|
||||||
cwd=${PWD}
|
cwd=${PWD}
|
||||||
src=${cwd}/${pkg}
|
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
|
||||||
|
|
||||||
mkdir ${src} && tar -zxvf "${tar_file}" -C ${src} --strip-components 1
|
mkdir ${src} && tar -zxvf "${tar_file}" -C ${src} --strip-components 1
|
||||||
if [ ! -d patch ]; then
|
if [ ! -d patch ]; then
|
||||||
@ -35,5 +35,5 @@ done <"${series}"
|
|||||||
cd "${cwd}"
|
cd "${cwd}"
|
||||||
|
|
||||||
cp -rf "${src}"/* .
|
cp -rf "${src}"/* .
|
||||||
cp -f VERSION-openeuler VERSION
|
cp -f VERSION-vendor VERSION
|
||||||
rm -rf "${src}"
|
rm -rf "${src}"
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
# Basic info
|
# Basic info
|
||||||
top_dir=$(git rev-parse --show-toplevel)
|
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"
|
spec_file="${top_dir}/isula-build.spec"
|
||||||
commit_file=${top_dir}/git-commit
|
commit_file=${top_dir}/git-commit
|
||||||
color=$(tput setaf 2) # red
|
color=$(tput setaf 2) # red
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
de59790370c6bb31408c4317e7dd71d1436fbece
|
e4b5a3bee5a69df32fb60b5eb8c28e1e8a39b59b
|
||||||
|
|||||||
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
Name: isula-build
|
Name: isula-build
|
||||||
Version: 0.9.6
|
Version: 0.9.6
|
||||||
Release: 13
|
Release: 14
|
||||||
Summary: A tool to build container images
|
Summary: A tool to build container images
|
||||||
License: Mulan PSL V2
|
License: Mulan PSL V2
|
||||||
URL: https://gitee.com/openeuler/isula-build
|
URL: https://gitee.com/openeuler/isula-build
|
||||||
Source0: https://gitee.com/openeuler/isula-build/repository/archive/v%{version}.tar.gz
|
Source0: https://gitee.com/openeuler/isula-build/repository/archive/v%{version}.tar.gz
|
||||||
Source1: git-commit
|
Source1: git-commit
|
||||||
Source2: VERSION-openeuler
|
Source2: VERSION-vendor
|
||||||
Source3: apply-patches
|
Source3: apply-patches
|
||||||
Source4: gen-version.sh
|
Source4: gen-version.sh
|
||||||
Source5: series.conf
|
Source5: series.conf
|
||||||
@ -85,6 +85,12 @@ fi
|
|||||||
/usr/share/bash-completion/completions/isula-build
|
/usr/share/bash-completion/completions/isula-build
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 23 2022 Lixiang <cooper.li@huawei.com> - 0.9.6-14
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:restart
|
||||||
|
- DESC:use vendor instead specific vendor name
|
||||||
|
|
||||||
* Tue Nov 01 2022 daisicheng <daisicheng@huawei.com> - 0.9.6-13
|
* Tue Nov 01 2022 daisicheng <daisicheng@huawei.com> - 0.9.6-13
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user