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

Accepting request 544764 from home:RBrownSUSE:branches:Virtualization:containers

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544764
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=64
This commit is contained in:
Aleksa Sarai 2017-11-24 10:06:55 +00:00 committed by Git OBS Bridge
parent ec48492ea8
commit 8e706de123
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containerd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:48:04 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Thu Oct 26 19:27:48 UTC 2017 - asarai@suse.com

9
containerd.spec
View File

@ -17,6 +17,11 @@
# nodebuginfo
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define go_tool go
%define GO_BUILD_FLAGS -buildmode=pie
@ -113,7 +118,7 @@ install -D -m755 ctr-%{version} %{buildroot}/%{_sbindir}/%{name}-ctr
install -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service
install -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{name}.socket
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd
install -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
install -D -m644 %SOURCE3 %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -d -m755 %{buildroot}/usr/src/containerd/
cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/
@ -140,7 +145,7 @@ cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/cont
%{_sbindir}/containerd-shim
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
/var/adm/fillup-templates/sysconfig.%{name}
%{_fillupdir}/sysconfig.%{name}
%{_sbindir}/rccontainerd
%files ctr