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

!14 iSulad: replace python to python3

Browse Source 
Merge pull request !14 from lifeng_isula/master
This commit is contained in:
openeuler-ci-bot 2020-02-26 12:00:53 +08:00 committed by Gitee
commit bee332f517
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/checker.cmake
View File

@ -3,9 +3,9 @@ include(CheckIncludeFile)
# check depends library and headers # check depends library and headers
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
# check python # check python3
find_program(CMD_PYTHON python) find_program(CMD_PYTHON python3)
_CHECK(CMD_PYTHON "CMD_PYTHON-NOTFOUND" "python") _CHECK(CMD_PYTHON "CMD_PYTHON-NOTFOUND" "python3")
# check tools # check tools
find_program(CMD_TAR tar) find_program(CMD_TAR tar)

2
iSulad.spec
View File

@ -34,7 +34,7 @@ BuildRequires: grpc grpc-devel protobuf-devel
BuildRequires: libcurl libcurl-devel sqlite-devel BuildRequires: libcurl libcurl-devel sqlite-devel
BuildRequires: http-parser-devel libevhtp-devel libevent-devel BuildRequires: http-parser-devel libevhtp-devel libevent-devel
BuildRequires: libseccomp-devel libcap-devel libwebsockets libwebsockets-devel BuildRequires: libseccomp-devel libcap-devel libwebsockets libwebsockets-devel
BuildRequires: systemd-devel git python2 BuildRequires: systemd-devel git python3
Requires: iSulad-img lcr lxc clibcni Requires: iSulad-img lcr lxc clibcni
Requires: grpc protobuf yajl Requires: grpc protobuf yajl

2
src/json/schema/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(cmdpath python) set(cmdpath python3)
set(pysrcpath ${CMAKE_CURRENT_SOURCE_DIR}/src/generate.py) set(pysrcpath ${CMAKE_CURRENT_SOURCE_DIR}/src/generate.py)
set(schemapath ${CMAKE_CURRENT_SOURCE_DIR}/schema) set(schemapath ${CMAKE_CURRENT_SOURCE_DIR}/schema)
set(outputpath ${CMAKE_BINARY_DIR}/json) set(outputpath ${CMAKE_BINARY_DIR}/json)