| |
@@ -54,7 +54,7 @@
|
| |
|
| |
# Do not use {goname}, which is golang-github-kata-containers-runtime
|
| |
Name: kata-%{repo}
|
| |
- Release: 2%{?rcrel}%{?dist}
|
| |
+ Release: 3%{?rcrel}%{?dist}
|
| |
Url: https://%{download}
|
| |
Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz
|
| |
|
| |
@@ -70,7 +70,7 @@
|
| |
%if 0%{?fedora}
|
| |
Requires: kata-proxy >= %{version}
|
| |
%endif
|
| |
- Requires: kata-shim >= %{version}
|
| |
+ Recommends: kata-shim >= %{version}
|
| |
Requires: kata-osbuilder >= %{version}
|
| |
|
| |
BuildRequires: libselinux-devel
|
| |
@@ -195,6 +195,14 @@
|
| |
%define sharedfs "virtio-9p"
|
| |
%endif
|
| |
|
| |
+ # FEATURE_SELINUX must be disabled for CentOS till the
|
| |
+ # podman package support it is avaiable.
|
| |
+ %if 0%{?centos}
|
| |
+ %define feature_selinux "no"
|
| |
+ %else
|
| |
+ %define feature_selinux "yes"
|
| |
+ %endif
|
| |
+
|
| |
%global make_vars QEMUPATH=%{qemupath} \\\
|
| |
DEFSHAREDFS=%{sharedfs} \\\
|
| |
DEFVIRTIOFSDAEMON=%{_libexecdir}/"virtiofsd" \\\
|
| |
@@ -206,7 +214,8 @@
|
| |
DESTDIR=%{buildroot} \\\
|
| |
PREFIX=/usr \\\
|
| |
DEFAULTSDIR=%{_datadir}/kata-containers/defaults \\\
|
| |
- CONFDIR=%{_datadir}/kata-containers/defaults
|
| |
+ CONFDIR=%{_datadir}/kata-containers/defaults \\\
|
| |
+ FEATURE_SELINUX=%{feature_selinux}
|
| |
|
| |
%prep
|
| |
%autosetup -p1 -n %{repo}-%{version}%{?rcstr}
|
| |
@@ -265,6 +274,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Thu Oct 9 2020 Fabiano Fidêncio <fidencio@redhat.com> - 1.11.1-3
|
| |
+ - Set kata-shim as recommended
|
| |
+ - Don't reenable SELinux support for CentOS
|
| |
+
|
| |
* Thu Jul 30 2020 Fabiano Fidêncio <fidencio@redhat.com> - 1.11.1-2
|
| |
- Reenable SELinux as podman 2.0 is already out
|
| |
|
| |
fidencio
commented 3 years ago
This patch has to be backported to f33 as well, and it does include https://src.fedoraproject.org/rpms/kata-runtime/pull-request/11.