rpm/runc
SHA256
1
0
Fork 0
forked from pool/runc
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=45

Browse Source
This commit is contained in:
Jordi Massaguer 2017-04-20 10:25:40 +00:00 committed by Git OBS Bridge
parent 6d3438c47b
commit f4e0799fbb
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runc.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Apr 12 09:55:28 UTC 2017 - jmassaguerpla@suse.com
- Make sure this is being built with go 1.7
-------------------------------------------------------------------
Tue Apr 11 15:37:36 UTC 2017 - jmassaguerpla@suse.com
- remove the go_arches macro because we are using go1.7 which
is available in all archs
-------------------------------------------------------------------
Wed Mar 29 15:47:52 UTC 2017 - jmassaguerpla@suse.com

42
runc.spec
View File

@ -16,25 +16,7 @@
#
# Check if go_arches is defined in the project configuration
# Otherwise, define it here
# In order to define it in the project configuration, see
#
# https://en.opensuse.org/openSUSE:Build%20Service%20prjconf#Macros
#
# The Macros tag is the one that defines the go_arches variable to be used
# in the spec file.
# The "define" one is to help the specfile parser of the buildservice
# to see what packages are being built. You also want to define it here
# for keeping things consistent.
%{!?go_arches: %global go_arches %ix86 x86_64 aarch64 ppc64le}
%ifarch %go_arches
%define go_tool go
%else
%define go_tool go-6
%endif
# MANUAL: Update the git_version and git_revision
# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into
@ -60,12 +42,10 @@ Source: %{name}-git.%{git_version}.tar.xz
Patch0: CVE-2016-9962.patch
Patch1: ignore_cgroup2_mountpoint.patch
BuildRequires: fdupes
%ifarch %go_arches
BuildRequires: go >= 1.5
# Make sure we require go 1.7
BuildRequires: go < 1.8
BuildRequires: go >= 1.7
BuildRequires: go-go-md2man
%else
BuildRequires: gcc6-go >= 6.1
%endif
BuildRequires: libapparmor-devel
# Seccomp isn't supported on aarch64.
%ifnarch aarch64
@ -83,13 +63,11 @@ and has grown to become a separate project entirely.
%package test
Summary: Test package for runc
# Make sure we require go 1.7
Group: System/Management
%ifarch %go_arches
Requires: go >= 1.5
BuildRequires: go < 1.8
BuildRequires: go >= 1.7
Requires: go-go-md2man
%else
Requires: gcc6-go >= 6.1
%endif
Requires: libapparmor-devel
# Seccomp isn't supported on aarch64.
%ifnarch aarch64
@ -132,11 +110,8 @@ export BUILDFLAGS="$BUILDFLAGS -lseccomp"
%go_tool build "$BUILDFLAGS" -tags "$BUILDTAGS" -x -o %{name}-%{version} github.com/opencontainers/%{name}
# Build man pages, this can only be done on arches where we can build go-md2man.
%ifarch %go_arches
man/md2man-all.sh
%endif
%ifarch %go_arches
%check
export GOPATH=$HOME/go/src/github.com/opencontainers/runc/Godeps/_workspace:$GOPATH
cd $HOME/go/src/github.com/opencontainers/runc
@ -148,7 +123,6 @@ PKG_LIST=$(go list ./... \
| grep -v 'github.com/opencontainers/runc/libcontainer/user$' \
| grep -v 'github.com/opencontainers/runc/libcontainer/xattr$')
go test -timeout 3m -tags "$BUILDTAGS" -v $PKG_LIST
%endif
%install
%{__install} -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name}
@ -159,10 +133,8 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/
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
%endif
%fdupes %{buildroot}/%{_prefix}
@ -174,9 +146,7 @@ ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc
%{_sbindir}/%{name}
%{_bindir}/docker-runc
%ifarch %go_arches
%{_mandir}/man8/runc*.8.gz
%endif
%files test
%defattr(-,root,root)