!7 修复container-selinux在mainline工程编译失败
From: @caodongxia Reviewed-by: @yangzhao_kl Signed-off-by: @yangzhao_kl
This commit is contained in:
commit
4d999cadb6
@ -0,0 +1,27 @@
|
|||||||
|
From 2ab60ecaf03083775312e49a1c3cd98a8cb3eb46 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wujing <wujing50@huawei.com>
|
||||||
|
Date: Mon, 30 Aug 2021 11:11:00 +0800
|
||||||
|
Subject: [PATCH] systemd_dbus_chat_resolved has been deprecated, use
|
||||||
|
systemd_chat_resolved instead
|
||||||
|
|
||||||
|
Signed-off-by: wujing <wujing50@huawei.com>
|
||||||
|
---
|
||||||
|
container.te | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/container.te b/container.te
|
||||||
|
index d17e4fe..63c5379 100644
|
||||||
|
--- a/container.te
|
||||||
|
+++ b/container.te
|
||||||
|
@@ -427,7 +427,7 @@ modutils_domtrans_kmod(container_runtime_domain)
|
||||||
|
systemd_status_all_unit_files(container_runtime_domain)
|
||||||
|
systemd_start_systemd_services(container_runtime_domain)
|
||||||
|
systemd_dbus_chat_logind(container_runtime_domain)
|
||||||
|
-systemd_dbus_chat_resolved(container_runtime_domain)
|
||||||
|
+systemd_chat_resolved(container_runtime_domain)
|
||||||
|
|
||||||
|
userdom_stream_connect(container_runtime_domain)
|
||||||
|
userdom_search_user_home_content(container_runtime_domain)
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -27,12 +27,13 @@
|
|||||||
Name: container-selinux
|
Name: container-selinux
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 2.138
|
Version: 2.138
|
||||||
Release: 4
|
Release: 5
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: %{git0}
|
URL: %{git0}
|
||||||
Summary: SELinux policies for container runtimes
|
Summary: SELinux policies for container runtimes
|
||||||
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
|
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
Patch1: 0001-systemd_dbus_chat_resolved-has-been-deprecated-use-s.patch
|
||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
BuildRequires: selinux-policy >= %{selinux_policyver}
|
BuildRequires: selinux-policy >= %{selinux_policyver}
|
||||||
BuildRequires: selinux-policy-devel >= %{selinux_policyver}
|
BuildRequires: selinux-policy-devel >= %{selinux_policyver}
|
||||||
@ -109,6 +110,9 @@ fi
|
|||||||
%{_datadir}/selinux/*
|
%{_datadir}/selinux/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 26 2021 caodongxia <caodongxia@huawei.com> - 2.138-5
|
||||||
|
- DESC: systemd_dbus_chat_resolved has been deprecated, use systemd_chat_resolved instead
|
||||||
|
|
||||||
* Wed Aug 11 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.138-4
|
* Wed Aug 11 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.138-4
|
||||||
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user