!635 remove libisulad_img.so and image_api.h in
* delete libisulad_img.so and compilation dependency: lxc, and add runni…
This commit is contained in:
parent
8c5a1e32f7
commit
7da5d7790b
17
iSulad.spec
17
iSulad.spec
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.1.4
|
%global _version 2.1.4
|
||||||
%global _release 1
|
%global _release 2
|
||||||
%global is_systemd 1
|
%global is_systemd 1
|
||||||
%global enable_criv1 1
|
%global enable_criv1 1
|
||||||
%global enable_shimv2 1
|
%global enable_shimv2 1
|
||||||
@ -37,7 +37,6 @@ Patch6001: 6001-modify-daemon-json-default-runtime-to-runc.patch
|
|||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64
|
||||||
Provides: libhttpclient.so()(64bit)
|
Provides: libhttpclient.so()(64bit)
|
||||||
Provides: libisula_client.so()(64bit)
|
Provides: libisula_client.so()(64bit)
|
||||||
Provides: libisulad_img.so()(64bit)
|
|
||||||
Provides: libisulad_tools.so()(64bit)
|
Provides: libisulad_tools.so()(64bit)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -65,7 +64,7 @@ BuildRequires: gtest-devel gmock-devel
|
|||||||
%define lcrver_upper 2.1.4-0
|
%define lcrver_upper 2.1.4-0
|
||||||
|
|
||||||
BuildRequires: libisula-devel > %{lcrver_lower} libisula-devel < %{lcrver_upper}
|
BuildRequires: libisula-devel > %{lcrver_lower} libisula-devel < %{lcrver_upper}
|
||||||
BuildRequires: cmake gcc-c++ yajl-devel lxc lxc-devel
|
BuildRequires: cmake gcc-c++ yajl-devel
|
||||||
BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel
|
BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel
|
||||||
BuildRequires: libcurl libcurl-devel libarchive-devel device-mapper-devel
|
BuildRequires: libcurl libcurl-devel libarchive-devel device-mapper-devel
|
||||||
BuildRequires: http-parser-devel
|
BuildRequires: http-parser-devel
|
||||||
@ -78,11 +77,12 @@ BuildRequires: lib-shim-v2 lib-shim-v2-devel
|
|||||||
|
|
||||||
|
|
||||||
Requires: libisula > %{lcrver_lower} libisula < %{lcrver_upper}
|
Requires: libisula > %{lcrver_lower} libisula < %{lcrver_upper}
|
||||||
Requires: grpc protobuf docker-runc
|
Requires: grpc protobuf
|
||||||
Requires: libcurl
|
Requires: libcurl
|
||||||
Requires: http-parser libseccomp
|
Requires: http-parser libseccomp
|
||||||
Requires: libcap libselinux libwebsockets libarchive device-mapper
|
Requires: libcap libselinux libwebsockets libarchive device-mapper
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
|
Requires: (docker-runc or runc)
|
||||||
BuildRequires: libevhtp libevent
|
BuildRequires: libevhtp libevent
|
||||||
%if 0%{?enable_shimv2}
|
%if 0%{?enable_shimv2}
|
||||||
Requires: lib-shim-v2
|
Requires: lib-shim-v2
|
||||||
@ -139,7 +139,6 @@ install -d $RPM_BUILD_ROOT/%{_libdir}
|
|||||||
install -m 0755 ./src/libisula_client.so %{buildroot}/%{_libdir}/libisula_client.so
|
install -m 0755 ./src/libisula_client.so %{buildroot}/%{_libdir}/libisula_client.so
|
||||||
install -m 0755 ./src/utils/http/libhttpclient.so %{buildroot}/%{_libdir}/libhttpclient.so
|
install -m 0755 ./src/utils/http/libhttpclient.so %{buildroot}/%{_libdir}/libhttpclient.so
|
||||||
install -m 0755 ./src/libisulad_tools.so %{buildroot}/%{_libdir}/libisulad_tools.so
|
install -m 0755 ./src/libisulad_tools.so %{buildroot}/%{_libdir}/libisulad_tools.so
|
||||||
install -m 0755 ./src/daemon/modules/image/libisulad_img.so %{buildroot}/%{_libdir}/libisulad_img.so
|
|
||||||
|
|
||||||
install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
|
install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
|
||||||
install -m 0640 ./conf/isulad.pc %{buildroot}/%{_libdir}/pkgconfig/isulad.pc
|
install -m 0640 ./conf/isulad.pc %{buildroot}/%{_libdir}/pkgconfig/isulad.pc
|
||||||
@ -152,7 +151,6 @@ install -m 0755 ./src/isulad-shim %{buildroot}/%{_bindir}/isulad-shim
|
|||||||
install -m 0755 ./src/isulad %{buildroot}/%{_bindir}/isulad
|
install -m 0755 ./src/isulad %{buildroot}/%{_bindir}/isulad
|
||||||
|
|
||||||
install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
|
install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
|
||||||
install -m 0644 ../src/daemon/modules/api/image_api.h %{buildroot}/%{_includedir}/isulad/image_api.h
|
|
||||||
|
|
||||||
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/isulad
|
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/isulad
|
||||||
install -m 0640 ../src/contrib/config/daemon.json %{buildroot}/%{_sysconfdir}/isulad/daemon.json
|
install -m 0640 ../src/contrib/config/daemon.json %{buildroot}/%{_sysconfdir}/isulad/daemon.json
|
||||||
@ -269,7 +267,6 @@ fi
|
|||||||
%{_initddir}/isulad.init
|
%{_initddir}/isulad.init
|
||||||
%attr(0640,root,root) %{_initddir}/isulad.init
|
%attr(0640,root,root) %{_initddir}/isulad.init
|
||||||
%endif
|
%endif
|
||||||
%{_includedir}/isulad/*
|
|
||||||
%attr(0755,root,root) %{_libdir}/pkgconfig
|
%attr(0755,root,root) %{_libdir}/pkgconfig
|
||||||
%attr(0640,root,root) %{_libdir}/pkgconfig/isulad.pc
|
%attr(0640,root,root) %{_libdir}/pkgconfig/isulad.pc
|
||||||
%defattr(0755,root,root,0755)
|
%defattr(0755,root,root,0755)
|
||||||
@ -287,6 +284,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 15 2023 zhongtao <zhongtao17@huawei.com> - 2.1.4-2
|
||||||
|
- Type: bugfix
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: delete libisulad_img.so and compilation dependency: lxc, and add running dependency:runc
|
||||||
|
|
||||||
* Tue Nov 14 2023 zhongtao <zhongtao17@huawei.com> - 2.1.4-1
|
* Tue Nov 14 2023 zhongtao <zhongtao17@huawei.com> - 2.1.4-1
|
||||||
- Type: update
|
- Type: update
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user