Accepting request 447965 from Virtualization:containers
- update runc to the version used in docker 1.12.5 (bsc#1016307). This fixes bsc#1015661 - For the moment, we have to switch to using Docker's fork of runC. This *will* be solved properly by creating a new package purely for Docker's runC fork, because it's quite silly to tie OCI project releases to Docker's vendoring scheme. Once this is fixed, this package will be switch to being purely-OCI. - add the /usr/bin/docker-run symlink to partially fix bsc#1015661 fix bsc#1009961 - update to 02f8fa7 because that is the needed version for docker 1.12.1 (bsc#1004490) it fails to build OBS-URL: https://build.opensuse.org/request/show/447965 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/runc?expand=0&rev=8
This commit is contained in:
commit
5a0827b682
8
_service
8
_service
@ -1,10 +1,14 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/opencontainers/runc.git</param>
|
||||
<!-- FIXME: This will (very soon) be split into a separate runC package,
|
||||
because we shouldn't be pinning it to Docker's release and vendoring
|
||||
schedule. Docker is a very peculiar user of runC and we should be
|
||||
providing runC as a separate package so that users can use it. -->
|
||||
<param name="url">https://github.com/docker/runc.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">runc</param>
|
||||
<param name="versionformat">git.%h</param>
|
||||
<param name="revision">02f8fa7863dd3f82909a73e2061897828460d52f</param>
|
||||
<param name="revision">f59ba3cdd76fdc08c004f42aa915996f6f420899</param>
|
||||
<param name="exclude">.git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:243c748d094c46a8d6ca283f9992d69be161bf5bd32716b0e20664caac456427
|
||||
size 405940
|
3
runc-git.f59ba3cdd76f.tar.xz
Normal file
3
runc-git.f59ba3cdd76f.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a82fddecb61fbef51d9dc1de2db9688c0936ea48ad7f023c65d8341aea8d2421
|
||||
size 406472
|
25
runc.changes
25
runc.changes
@ -1,15 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- update runc to the version used in docker 1.12.5 (bsc#1016307).
|
||||
This fixes bsc#1015661
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 19 12:17:07 UTC 2016 - asarai@suse.com
|
||||
|
||||
- For the moment, we have to switch to using Docker's fork of runC. This *will*
|
||||
be solved properly by creating a new package purely for Docker's runC fork,
|
||||
because it's quite silly to tie OCI project releases to Docker's vendoring
|
||||
scheme. Once this is fixed, this package will be switch to being purely-OCI.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 16 17:05:37 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- add the /usr/bin/docker-run symlink to partially fix bsc#1015661
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 11:05:41 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- fix version by adding a revision "counter" so that it will always
|
||||
increase
|
||||
|
||||
fix bsc#1009961
|
||||
fix bsc#1009961
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 11:04:27 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- update to 02f8fa7 because that is the needed version for docker 1.12.1 (bsc#1004490)
|
||||
- update to 02f8fa7 because that is the needed version for docker 1.12.1 (bsc#1004490)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 21 05:13:26 UTC 2016 - jengelh@inai.de
|
||||
@ -20,7 +39,7 @@ Wed Sep 21 05:13:26 UTC 2016 - jengelh@inai.de
|
||||
Mon Sep 19 11:57:45 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- fix go_arches definition: use global instead of define, otherwise
|
||||
it fails to build
|
||||
it fails to build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 26 08:59:54 UTC 2016 - asarai@suse.com
|
||||
|
15
runc.spec
15
runc.spec
@ -37,13 +37,16 @@
|
||||
%endif
|
||||
|
||||
# MANUAL: Update the git_version and git_revision
|
||||
%define git_version 02f8fa7
|
||||
# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into
|
||||
# a separate package. This whole versioning mess is caused by
|
||||
# Docker vendoring non-releases of runC.
|
||||
%define git_version f59ba3cdd76f
|
||||
# How to get the git_revision
|
||||
# git clone ${url}.git runc-upstream
|
||||
# cd runc-upstream
|
||||
# git checkout $git_version
|
||||
# git_revision=r$(git rev-list HEAD | wc -l)
|
||||
%define git_revision r2816
|
||||
%define git_revision r2818
|
||||
%define version_unconverted %{git_version}
|
||||
|
||||
Name: runc
|
||||
@ -99,7 +102,6 @@ Test package for runc. It contains the source code and the tests.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-git.%{git_version}
|
||||
# Apply the vendor'd patch to the right subdirectory.
|
||||
|
||||
%build
|
||||
# Do not use symlinks. If you want to run the unit tests for this package at
|
||||
@ -147,6 +149,10 @@ go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST
|
||||
install -d -m755 %{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
|
||||
%{__install} -d -m755 %{buildroot}%{_mandir}/man8
|
||||
%{__install} -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
|
||||
@ -154,10 +160,13 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/
|
||||
|
||||
%fdupes %{buildroot}/%{_prefix}
|
||||
|
||||
%post
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README.md LICENSE
|
||||
%{_sbindir}/%{name}
|
||||
%{_bindir}/docker-runc
|
||||
|
||||
%ifarch %go_arches
|
||||
%{_mandir}/man8/runc*.8.gz
|
||||
|
Loading…
Reference in New Issue
Block a user