From c9c9a9be7ee03fbe39b7f26f32f2f9074660dc9bc16977f6dc0c61532457c3f1 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Fri, 26 Aug 2016 10:03:29 +0000 Subject: [PATCH] Accepting request 422801 from home:cyphar:branches:Virtualization:containers Removes the docker-runc symlink, since that's been fixed as part of sr#422714 OBS-URL: https://build.opensuse.org/request/show/422801 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=22 --- runc.changes | 14 ++++++++++---- runc.spec | 2 -- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/runc.changes b/runc.changes index d5bdbe3..eff4630 100644 --- a/runc.changes +++ b/runc.changes @@ -1,27 +1,33 @@ +------------------------------------------------------------------- +Fri Aug 26 08:59:54 UTC 2016 - asarai@suse.com + +- Remove docker-runc symlink because it's been fixed within the Docker + package. bsc#978260 + ------------------------------------------------------------------- Thu Aug 25 17:02:33 UTC 2016 - jmassaguerpla@suse.com - Create a symlink /usr/sbin/docker-runc -> /usr/sbin/docker - Docker expects this symlink to exist + Docker expects this symlink to exist bsc#978260 ------------------------------------------------------------------- Thu Aug 25 15:56:00 UTC 2016 - jmassaguerpla@suse.com - Remove GOPATH at the end of the GOPATH assignment cause GOPATH is empty and if we do that, we get the path "" - appended, which causes gcc6-go to complain + appended, which causes gcc6-go to complain ------------------------------------------------------------------- Wed Aug 24 12:27:57 UTC 2016 - jmassaguerpla@suse.com - add go_arches in project configuration: this way, we can use the same spec file but decide in the project configuration if to - use gc-go or gcc-go for some archs. + use gc-go or gcc-go for some archs. ------------------------------------------------------------------- Thu Aug 18 10:35:29 UTC 2016 - jmassaguerpla@suse.com -- use gcc6-go instead of gcc5-go (bsc#988408) +- use gcc6-go instead of gcc5-go (bsc#988408) - build ppc64le with gc-go because this version builds with gc-go 1.6 ------------------------------------------------------------------- diff --git a/runc.spec b/runc.spec index 6fc1cb6..c618e81 100644 --- a/runc.spec +++ b/runc.spec @@ -136,7 +136,6 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST %install %{__install} -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name} -ln -s %{_sbindir}/%{name} %{buildroot}/%{_sbindir}/docker-%{name} install -d -m755 %{buildroot}/usr/src/runc/ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ @@ -149,7 +148,6 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/ %defattr(-,root,root) %doc README.md LICENSE %{_sbindir}/%{name} -%{_sbindir}/docker-%{name} %ifarch %go_arches %{_mandir}/man8/runc*.8.gz