提交 259d4126 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!383 update release version

Merge pull request !383 from haozi007/adapt
...@@ -111,18 +111,6 @@ mkdir -p ${builddir}/rpm ...@@ -111,18 +111,6 @@ mkdir -p ${builddir}/rpm
cp lxc-*.rpm ${builddir}/rpm cp lxc-*.rpm ${builddir}/rpm
ldconfig ldconfig
#install iSula-tools
cd ~
git clone https://gitee.com/openeuler/iSula-libutils.git
cd iSula-libutils
mkdir -p build
cd build
cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} ../
make -j $(nproc)
make install
cd -
ldconfig
# install lcr # install lcr
cd ~ cd ~
git clone https://gitee.com/openeuler/lcr.git git clone https://gitee.com/openeuler/lcr.git
......
...@@ -9,7 +9,7 @@ include(cmake/set_build_flags.cmake) ...@@ -9,7 +9,7 @@ include(cmake/set_build_flags.cmake)
#set(CMAKE_C_COMPILER "gcc" CACHE PATH "c compiler") #set(CMAKE_C_COMPILER "gcc" CACHE PATH "c compiler")
set(GIT_COMMIT_HASH "cd4ac2f2760e4fe00b073dc10e10d0e6ac5ff770") set(GIT_COMMIT_HASH "9014f8a4478a169f5426a27c8c1e58dcf14023ef")
message("-- commit id: " ${GIT_COMMIT_HASH}) message("-- commit id: " ${GIT_COMMIT_HASH})
add_definitions(-DISULAD_GIT_COMMIT="${GIT_COMMIT_HASH}") add_definitions(-DISULAD_GIT_COMMIT="${GIT_COMMIT_HASH}")
......
...@@ -33,7 +33,7 @@ endif() ...@@ -33,7 +33,7 @@ endif()
option(VERSION "set isulad version" ON) option(VERSION "set isulad version" ON)
if (VERSION STREQUAL "ON") if (VERSION STREQUAL "ON")
set(ISULAD_VERSION "2.0.1") set(ISULAD_VERSION "2.0.2")
endif() endif()
option(DEBUG "set isulad gcc option" ON) option(DEBUG "set isulad gcc option" ON)
......
%global _version 2.0.1 %global _version 2.0.2
%global _release 20200526.144537.gitcd4ac2f2 %global _release 20200526.162305.git9014f8a4
%global is_systemd 1 %global is_systemd 1
%global debug_package %{nil} %global debug_package %{nil}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册