Accepting request 447963 from home:jordimassaguerpla:branch:Vc:fix_runc_symlink

OBS-URL: https://build.opensuse.org/request/show/447963
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=34
This commit is contained in:
Aleksa Sarai 2016-12-28 10:08:10 +00:00 committed by Git OBS Bridge
parent eb1aad3421
commit 24bfdba743
2 changed files with 5 additions and 11 deletions

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Wed Dec 21 09:43:06 UTC 2016 - jmassaguerpla@suse.com
- add symlink to docker-runc in the post section, as this is how it
has been already fixed for some client. fixes bsc#1015661
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com

View File

@ -149,6 +149,10 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST
install -d -m755 %{buildroot}/usr/src/runc/ install -d -m755 %{buildroot}/usr/src/runc/
cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/
# symlink runc as docker-runc. bsc#1015661
install -d -m755 %{buildroot}/%{_bindir}
ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc
%ifarch %go_arches %ifarch %go_arches
%{__install} -d -m755 %{buildroot}%{_mandir}/man8 %{__install} -d -m755 %{buildroot}%{_mandir}/man8
%{__install} -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8 %{__install} -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
@ -157,16 +161,12 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/
%fdupes %{buildroot}/%{_prefix} %fdupes %{buildroot}/%{_prefix}
%post %post
echo "Running Post Install Script"
if [ ! -e "/usr/bin/docker-runc" ]
then
ln -s /usr/sbin/runc /usr/bin/docker-runc
fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README.md LICENSE %doc README.md LICENSE
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_bindir}/docker-runc
%ifarch %go_arches %ifarch %go_arches
%{_mandir}/man8/runc*.8.gz %{_mandir}/man8/runc*.8.gz