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

Accepting request 487532 from home:jordimassaguerpla:branches:V:c:docker_with_go_1_7

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/487532
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=48
This commit is contained in:
Jordi Massaguer 2017-04-20 10:25:35 +00:00 committed by Git OBS Bridge
parent b7e9874a22
commit fa22ee39af
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
containerd.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Apr 12 09:56:54 UTC 2017 - jmassaguerpla@suse.com
- make sure this package is being built with go 1.7
-------------------------------------------------------------------
Wed Apr 12 09:13:44 UTC 2017 - jmassaguerpla@suse.com
- remove the go_arches macro because we are using go1.7 which
is available in all archs
-------------------------------------------------------------------
Wed Apr 12 08:02:59 UTC 2017 - asarai@suse.com

45
containerd.spec
View File

@ -16,27 +16,8 @@
#
# 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
%define GO_BUILD_FLAGS %{nil}
%else
%define go_tool go-6
%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl"
%endif
# MANUAL: Update the git_version and git_revision
%define git_version 03e5862
@ -59,11 +40,9 @@ Source: %{name}-git.%{git_version}.tar.xz
Source1: %{name}.service
Source2: %{name}.socket
Source3: sysconfig.%{name}
%ifarch %go_arches
BuildRequires: go >= 1.5
%else
BuildRequires: gcc6-go >= 6.1
%endif
# Make sure we require go 1.7
BuildRequires: go < 1.8
BuildRequires: go >= 1.7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Currently runC is the only supported runtime for containerd. NOTE:
# This version pinning is done to follow (as well as we can) upstream's
@ -88,11 +67,9 @@ migration of containers.
Summary: Client for %{name}
Group: System/Management
Requires: %{name} = %{version}
%ifarch %go_arches
BuildRequires: go >= 1.5
%else
BuildRequires: gcc6-go >= 6.1
%endif
# Make sure we require go 1.7
BuildRequires: go < 1.8
BuildRequires: go >= 1.7
%description ctr
Standalone client for containerd, which allows management of containerd containers
@ -100,12 +77,10 @@ separately from Docker.
%package test
Summary: Test package for containerd
# Make sure we require go 1.7
Group: System/Management
%ifarch %go_arches
Requires: go >= 1.5
%else
Requires: gcc5-go >= 5.0
%endif
BuildRequires: go < 1.8
BuildRequires: go >= 1.7
BuildArch: noarch
%description test
@ -132,12 +107,10 @@ cp -avr * $HOME/go/src/github.com/docker/containerd
# Build client.
%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version} github.com/docker/%{name}/%{client}
%ifarch %go_arches
%check
export GOPATH=$HOME/go/src/github.com/docker/containerd/vendor:$GOPATH
cd $HOME/go/src/github.com/docker/containerd
go test -v $(go list ./... | grep github.com/docker/containerd | grep -v /integration-test)
%endif
%install
%{__install} -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon}