!490 fix cannot install isulad and unknown option
From: @zh_xiaoyu Reviewed-by: @jingwoo Signed-off-by: @jingwoo
This commit is contained in:
commit
f368e148c7
32
0044-fix-can-not-install-isulad-rpm-because-of-spec.patch
Normal file
32
0044-fix-can-not-install-isulad-rpm-because-of-spec.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 1bf460aa845611fbf20136eaa147b6c75f9419f1 Mon Sep 17 00:00:00 2001
|
||||
From: Mig Yang <418109103@qq.com>
|
||||
Date: Wed, 16 Nov 2022 17:32:18 +0800
|
||||
Subject: [PATCH 44/45] fix can not install isulad rpm because of spec
|
||||
|
||||
---
|
||||
iSulad.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/iSulad.spec b/iSulad.spec
|
||||
index e9826a29..97c6bcb3 100644
|
||||
--- a/iSulad.spec
|
||||
+++ b/iSulad.spec
|
||||
@@ -18,6 +18,7 @@ ExclusiveArch: x86_64 aarch64
|
||||
Provides: libhttpclient.so()(64bit)
|
||||
Provides: libisula.so()(64bit)
|
||||
Provides: libisulad_img.so()(64bit)
|
||||
+Provides: libisulad_tools.so()(64bit)
|
||||
%endif
|
||||
|
||||
%if 0%{?is_systemd}
|
||||
@@ -79,6 +80,7 @@ cd build
|
||||
install -d $RPM_BUILD_ROOT/%{_libdir}
|
||||
install -m 0644 ./src/libisula.so %{buildroot}/%{_libdir}/libisula.so
|
||||
install -m 0644 ./src/utils/http/libhttpclient.so %{buildroot}/%{_libdir}/libhttpclient.so
|
||||
+install -m 0644 ./src/libisulad_tools.so %{buildroot}/%{_libdir}/libisulad_tools.so
|
||||
install -m 0644 ./src/daemon/modules/image/libisulad_img.so %{buildroot}/%{_libdir}/libisulad_img.so
|
||||
chmod +x %{buildroot}/%{_libdir}/libisula.so
|
||||
chmod +x %{buildroot}/%{_libdir}/libhttpclient.so
|
||||
--
|
||||
2.25.1
|
||||
|
||||
25
0045-remove-unknown-option-wno-maybe-uninitialized.patch
Normal file
25
0045-remove-unknown-option-wno-maybe-uninitialized.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From a81cc3350766a352ab29c2d884b5542c5207f93f Mon Sep 17 00:00:00 2001
|
||||
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||
Date: Mon, 21 Nov 2022 16:16:41 +0800
|
||||
Subject: [PATCH 45/45] remove unknown option wno-maybe-uninitialized
|
||||
|
||||
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||
---
|
||||
test/CMakeLists.txt | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 92a4e969..6b6cd5de 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -1,7 +1,5 @@
|
||||
project(iSulad_UT)
|
||||
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
|
||||
-
|
||||
function(gmock_find_library _name)
|
||||
find_library(${_name}
|
||||
NAMES ${ARGN}
|
||||
--
|
||||
2.25.1
|
||||
|
||||
10
iSulad.spec
10
iSulad.spec
@ -1,5 +1,5 @@
|
||||
%global _version 2.0.17
|
||||
%global _release 7
|
||||
%global _release 8
|
||||
%global is_systemd 1
|
||||
%global enable_shimv2 1
|
||||
%global is_embedded 1
|
||||
@ -56,6 +56,8 @@ Patch0040: 0040-bugfix-for-websocket-receive-data-too-long.patch
|
||||
Patch0041: 0041-fix-call-bim_put-in-im_get_rootfs_dir.patch
|
||||
Patch0042: 0042-isula-usage-consistency-optimization.patch
|
||||
Patch0043: 0043-fix-do-container_unref-in-oci_rootfs_clean.patch
|
||||
Patch0044: 0044-fix-can-not-install-isulad-rpm-because-of-spec.patch
|
||||
Patch0045: 0045-remove-unknown-option-wno-maybe-uninitialized.patch
|
||||
|
||||
%ifarch x86_64 aarch64
|
||||
Provides: libhttpclient.so()(64bit)
|
||||
@ -282,6 +284,12 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 21 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.17-8
|
||||
- Type: bugfix
|
||||
- ID: NA
|
||||
- SUG: NA
|
||||
- DESC: fix cannot install isulad and unknown option
|
||||
|
||||
* Wed Nov 16 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.17-7
|
||||
- Type: bugfix
|
||||
- ID: NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user