!341 fix install error when android
From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
This commit is contained in:
commit
0902392968
46
0002-fix-install-error-when-android.patch
Normal file
46
0002-fix-install-error-when-android.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 426a282802b8b81c66e6857857a745583f816c0a Mon Sep 17 00:00:00 2001
|
||||||
|
From: WangFengTu <wangfengtu@huawei.com>
|
||||||
|
Date: Tue, 24 May 2022 16:51:02 +0800
|
||||||
|
Subject: [PATCH] fix install error when android
|
||||||
|
|
||||||
|
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
|
||||||
|
---
|
||||||
|
src/common/constants.h | 2 +-
|
||||||
|
src/contrib/config/{lxc_contexts => container_contexts} | 0
|
||||||
|
src/daemon/common/selinux_label.c | 2 +-
|
||||||
|
3 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
rename src/contrib/config/{lxc_contexts => container_contexts} (100%)
|
||||||
|
|
||||||
|
diff --git a/src/common/constants.h b/src/common/constants.h
|
||||||
|
index 56c88d46..60fb9abe 100644
|
||||||
|
--- a/src/common/constants.h
|
||||||
|
+++ b/src/common/constants.h
|
||||||
|
@@ -66,7 +66,7 @@ extern "C" {
|
||||||
|
|
||||||
|
#define ISULAD_CONFIG SYSCONFDIR_PREFIX"/etc/isulad"
|
||||||
|
|
||||||
|
-#define ISULAD_DAEMON_LXC_CONTEXTS ISULAD_CONFIG "/container_contexts"
|
||||||
|
+#define ISULAD_DAEMON_CONTAINER_CONTEXTS ISULAD_CONFIG "/container_contexts"
|
||||||
|
#define ISULAD_DAEMON_JSON_CONF_FILE ISULAD_CONFIG "/daemon.json"
|
||||||
|
#define ISULAD_DAEMON_CONSTANTS_JSON_CONF_FILE ISULAD_CONFIG "/daemon_constants.json"
|
||||||
|
|
||||||
|
diff --git a/src/contrib/config/lxc_contexts b/src/contrib/config/container_contexts
|
||||||
|
similarity index 100%
|
||||||
|
rename from src/contrib/config/lxc_contexts
|
||||||
|
rename to src/contrib/config/container_contexts
|
||||||
|
diff --git a/src/daemon/common/selinux_label.c b/src/daemon/common/selinux_label.c
|
||||||
|
index 9efd16e9..5468111e 100644
|
||||||
|
--- a/src/daemon/common/selinux_label.c
|
||||||
|
+++ b/src/daemon/common/selinux_label.c
|
||||||
|
@@ -593,7 +593,7 @@ static int container_label(char **process_label, char **file_label)
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
- lxc_path = ISULAD_DAEMON_LXC_CONTEXTS;
|
||||||
|
+ lxc_path = ISULAD_DAEMON_CONTAINER_CONTEXTS;
|
||||||
|
#else
|
||||||
|
lxc_path = selinux_lxc_contexts_path();
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.14
|
%global _version 2.0.14
|
||||||
%global _release 2
|
%global _release 3
|
||||||
%global is_systemd 1
|
%global is_systemd 1
|
||||||
%global enable_shimv2 1
|
%global enable_shimv2 1
|
||||||
%global is_embedded 1
|
%global is_embedded 1
|
||||||
@ -14,6 +14,7 @@ Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar
|
|||||||
BuildRoot: {_tmppath}/iSulad-%{version}
|
BuildRoot: {_tmppath}/iSulad-%{version}
|
||||||
|
|
||||||
Patch0001: 0001-do-not-mkdir-of-isulad-if-no-controller-found.patch
|
Patch0001: 0001-do-not-mkdir-of-isulad-if-no-controller-found.patch
|
||||||
|
Patch0002: 0002-fix-install-error-when-android.patch
|
||||||
|
|
||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64
|
||||||
Provides: libhttpclient.so()(64bit)
|
Provides: libhttpclient.so()(64bit)
|
||||||
@ -241,6 +242,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.14-3
|
||||||
|
- Type: enhancement
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: fix install error when android
|
||||||
|
|
||||||
* Tue May 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.14-2
|
* Tue May 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.14-2
|
||||||
- Type: enhancement
|
- Type: enhancement
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user