diff --git a/iSulad.spec b/iSulad.spec index 2f80278..6f99573 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.1.2 -%global _release 6 +%global _release 7 %global is_systemd 1 %global enable_shimv2 1 %global is_embedded 1 @@ -99,17 +99,20 @@ mkdir -p build cd build %if 0%{?enable_shimv2} %if %{defined openeuler} -%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ +%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %else -%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ +%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %endif %else %if %{defined openeuler} -%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ +%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %else -%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ +%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %endif %endif + +sed -i "10 a\# undef linux" grpc/src/api/services/cri/api.pb.h + %make_build %check @@ -274,6 +277,12 @@ fi %endif %changelog +* Mon Aug 21 2023 zhangxiaoyu - 2.1.2-7 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: enable grpc and fix compile failed + * Wed Aug 09 2023 zhangxiaoyu - 2.1.2-6 - Type: bugfix - ID: NA