packages/lcr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove build platform restrictions

Browse Source 
Signed-off-by: wujing <wujing50@huawei.com>
This commit is contained in:
wujing 2021-11-16 15:29:02 +08:00
parent 9d32f8f648
commit 193ed9fd4e
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcr.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.6 %global _version 2.0.6
%global _release 2 %global _release 3
%global _inner_name isula_libutils %global _inner_name isula_libutils
Name: lcr Name: lcr
@ -22,7 +22,6 @@ BuildRequires: lxc >= %{lxcver}
BuildRequires: lxc-devel >= %{lxcver} BuildRequires: lxc-devel >= %{lxcver}
BuildRequires: zlib-devel yajl-devel gtest-devel BuildRequires: zlib-devel yajl-devel gtest-devel
Requires: lxc >= %{lxcver} yajl zlib Requires: lxc >= %{lxcver} yajl zlib
ExclusiveArch: x86_64 aarch64
%ifarch x86_64 %ifarch x86_64
Provides: liblcr.so()(64bit) Provides: liblcr.so()(64bit)
@ -103,6 +102,12 @@ rm -rf %{buildroot}
%{_includedir}/%{_inner_name}/*.h %{_includedir}/%{_inner_name}/*.h
%changelog %changelog
* Tue Nov 16 2021 wujing <wujing50@huawei.com> - 2.0.6-3
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: remove build platform restrictions
* Thu Nov 09 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-2 * Thu Nov 09 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-2
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA

21
update-version.bash → update-version.sh
View File

@ -1,3 +1,7 @@
#!/bin/bash
#
# usage
# ./update-version.sh
####################################################################### #######################################################################
# lcr: utils library for iSula # lcr: utils library for iSula
# #
@ -21,18 +25,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# #
####################################################################### #######################################################################
#!/bin/bash
#
# usage
# ./update-version.bash
topDir=$(git rev-parse --show-toplevel) topDir=$(git rev-parse --show-toplevel)
specfile="${topDir}/lcr.spec" specfile="${topDir}/lcr.spec"
CMakefile="${topDir}/CMakeLists.txt"
old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'}) old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'})
first_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $1'}) first_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $1'})
second_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $2'}) second_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $2'})
third_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $3'}) third_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $3'})
read -p "Which level version do you want to upgrade?[1/2/3/d/N](default:N) select:" choice read -p "Which level version do you want to upgrade?[1/2/3/r/N](default:N) select:" choice
if [[ ! -n "${choice}" || ${choice} == "N" ]]; then if [[ ! -n "${choice}" || ${choice} == "N" ]]; then
echo "The version number has not been modified, it is still ${old_version}" echo "The version number has not been modified, it is still ${old_version}"
exit 0 exit 0
@ -51,15 +50,9 @@ fi
new_version=${first_old_version}.${second_old_version}.${third_old_version} new_version=${first_old_version}.${second_old_version}.${third_old_version}
echo "The version number has been modified: ${old_version} => ${new_version}"
old_release=$(cat ${specfile} | grep "%global" | grep "_release" | awk {'print $3'}) old_release=$(cat ${specfile} | grep "%global" | grep "_release" | awk {'print $3'})
commit_id_long=`git log --pretty=oneline -1 | awk {'print $1'}` new_release=$(($old_release+1))
commit_id=${commit_id_long:0:8}
new_release=`date "+%Y%m%d"`.`date "+%H%M%S"`.git$commit_id
echo "The relase version has been modified, it is ${new_release}"
sed -i "s/set(LCR_VERSION \"${old_version}\")/set(LCR_VERSION \"${new_version}\")/g" ${CMakefile}
sed -i "s/^\%global _version ${old_version}$/\%global _version ${new_version}/g" ${specfile} sed -i "s/^\%global _version ${old_version}$/\%global _version ${new_version}/g" ${specfile}
sed -i "s/^\%global _release ${old_release}$/\%global _release ${new_release}/g" ${specfile} sed -i "s/^\%global _release ${old_release}$/\%global _release ${new_release}/g" ${specfile}
echo "The release number has been modified: ${old_release} => ${new_release}" echo "The release version has been modified: ${old_version}-${old_release} => ${new_version}-${new_release}"