diff --git a/iSulad.spec b/iSulad.spec index ba455a3cf657b70165d2c6b138e9bb7dc3fef9a8..ce59b9c49f03dba8dc70d871ebc4cb41e6825631 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,11 +1,16 @@ %global _version 2.1.5 -%global _release 12 +%global _release 13 %global is_systemd 1 %global enable_criv1 1 +%global enable_cdi 1 %global enable_shimv2 1 %global is_embedded 1 %global cpp_std 17 +%ifarch x86_64 aarch64 +%global enable_nri 1 +%endif + Name: iSulad Version: %{_version} Release: %{_release} @@ -196,7 +201,9 @@ BuildRequires: libevhtp-devel libevent-devel %if 0%{?enable_shimv2} BuildRequires: lib-shim-v2 lib-shim-v2-devel %endif - +%if 0%{?enable_nri} +BuildRequires: isula-rust-extensions-devel +%endif Requires: libisula > %{lcrver_lower} libisula < %{lcrver_upper} Requires: grpc protobuf @@ -209,6 +216,9 @@ BuildRequires: libevhtp libevent %if 0%{?enable_shimv2} Requires: lib-shim-v2 %endif +%if 0%{?enable_nri} +Requires: isula-rust-extensions +%endif %description This is a umbrella project for gRPC-services based Lightweight Container @@ -227,7 +237,12 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ %if 0%{?enable_criv1} -DENABLE_CRI_API_V1=ON \ - -DENABLE_SANDBOXER=ON \ +%if 0%{?enable_cdi} + -DENABLE_CDI=ON \ +%endif +%if 0%{?enable_nri} + -DENABLE_NRI=ON \ +%endif %endif %if 0%{?enable_shimv2} -DENABLE_SHIM_V2=ON \ @@ -410,6 +425,12 @@ fi %endif %changelog +* Thu Nov 21 2024 zhongtao - 2.1.5-13 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: enable nri support only on specified architecture + * Mon Oct 21 2024 wujichao - 2.1.5-12 - Type: update - ID: NA