pool/cni
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 594872 from devel:CaaSP:Head:ControllerNode

Browse Source 
autosubmit from concourse

OBS-URL: https://build.opensuse.org/request/show/594872
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cni?expand=0&rev=3
This commit is contained in:
Yuchen Lin 2018-04-11 11:59:38 +00:00 committed by Git OBS Bridge
commit b53bef50a1
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cni.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 4 11:32:32 UTC 2018 - jmassaguerpla@suse.com
- Remove creating subvolumes. This should be in another package (kubernetes-kubelet)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 11:12:16 UTC 2018 - kmacinnes@suse.com Mon Jan 29 11:12:16 UTC 2018 - kmacinnes@suse.com

13
cni.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cni # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define cni_etc_dir %{_sysconfdir}/cni %define cni_etc_dir %{_sysconfdir}/cni
%define cni_bin_dir %{_libexecdir}/cni %define cni_bin_dir %{_libexecdir}/cni
%define cni_doc_dir %{_docdir}/cni %define cni_doc_dir %{_docdir}/cni
@ -28,9 +29,6 @@ Group: System/Management
Url: https://github.com/containernetworking/cni Url: https://github.com/containernetworking/cni
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
Source1: 99-loopback.conf Source1: 99-loopback.conf
%if 0%{?is_susecaasp}
Requires(post): snapper
%endif
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: shadow BuildRequires: shadow
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -79,13 +77,6 @@ cp CONTRIBUTING.md README.md LICENSE DCO %{buildroot}%{cni_doc_dir}/
%post %post
%{fillup_only -n %{name}} %{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 %files
%defattr(-,root,root) %defattr(-,root,root)
%doc CONTRIBUTING.md README.md LICENSE DCO %doc CONTRIBUTING.md README.md LICENSE DCO