Accepting request 576956 from home:asaurin:branches:devel:CaaSP:Head:ControllerNode

Remove the creation of CNI dirs (as CNI is installed in a container)

OBS-URL: https://build.opensuse.org/request/show/576956
OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/cni?expand=0&rev=8
This commit is contained in:
Kiall Mac Innes 2018-02-15 11:29:48 +00:00 committed by Git OBS Bridge
parent 9f25d69057
commit ddd53bef94

View File

@ -1,7 +1,7 @@
#
# spec file for package cni
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define cni_etc_dir %{_sysconfdir}/cni
%define cni_bin_dir %{_libexecdir}/cni
%define cni_doc_dir %{_docdir}/cni
@ -28,9 +29,6 @@ Group: System/Management
Url: https://github.com/containernetworking/cni
Source: %{name}-%{version}.tar.xz
Source1: 99-loopback.conf
%if 0%{?is_susecaasp}
Requires(post): snapper
%endif
BuildRequires: golang-packaging
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
@ -79,13 +77,6 @@ cp CONTRIBUTING.md README.md LICENSE DCO %{buildroot}%{cni_doc_dir}/
%post
%{fillup_only -n %{name}}
# create a (writable) state dir for plugins
%if 0%{?is_susecaasp}
test -e /var/lib/cni || /usr/sbin/mksubvolume /var/lib/cni
%else
mkdir -p /var/lib/cni
%endif
%files
%defattr(-,root,root)
%doc CONTRIBUTING.md README.md LICENSE DCO