Hello community, here is the log from the commit of package runc for openSUSE:Factory checked in at 2016-09-21 18:49:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/runc (Old) and /work/SRC/openSUSE:Factory/.runc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "runc" Changes: -------- --- /work/SRC/openSUSE:Factory/runc/runc.changes 2016-08-18 09:18:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.runc.new/runc.changes 2016-09-21 18:49:19.000000000 +0200 @@ -1,0 +2,49 @@ +Mon Sep 19 11:57:45 UTC 2016 - jmassaguer...@suse.com + +- fix go_arches definition: use global instead of define, otherwise + it fails to build + +------------------------------------------------------------------- +Fri Aug 26 08:59:54 UTC 2016 - asa...@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 - jmassaguer...@suse.com + +- Create a symlink /usr/sbin/docker-runc -> /usr/sbin/docker + Docker expects this symlink to exist bsc#978260 + +------------------------------------------------------------------- +Thu Aug 25 15:56:00 UTC 2016 - jmassaguer...@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 + +------------------------------------------------------------------- +Wed Aug 24 12:27:57 UTC 2016 - jmassaguer...@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. + +------------------------------------------------------------------- +Thu Aug 18 10:35:29 UTC 2016 - jmassaguer...@suse.com + +- use gcc6-go instead of gcc5-go (bsc#988408) +- build ppc64le with gc-go because this version builds with gc-go 1.6 + +------------------------------------------------------------------- +Thu Aug 18 10:34:29 UTC 2016 - cbrau...@suse.de + +- bump git commit id to the one required by docker v1.12.0 (bsc#995058) +- run unit tests during package build +- remove seccomp-use-pkg-config.patch + The patch is now upstream. +- remove GO_BUILD_FLAGS macro and substitute with BUILDFLAGS env variable to + allow for easier string appending. +- only run unit test on architectures that provide the go list and go test tools + +------------------------------------------------------------------- Old: ---- runc-0.1.1.tar.xz seccomp-use-pkg-config.patch New: ---- runc-git.cc29e3d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ runc.spec ++++++ --- /var/tmp/diff_new_pack.qSUnuG/_old 2016-09-21 18:49:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qSUnuG/_new 2016-09-21 18:49:21.000000000 +0200 @@ -16,31 +16,42 @@ # -%define go_arches %ix86 x86_64 aarch64 +# 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-5 -%define GO_BUILD_FLAGS "-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl -lseccomp -lselinux -lapparmor" +%define go_tool go-6 %endif -%define version_unconverted 0.1.1 +%define git_version cc29e3d +%define version_unconverted %{git_version} Name: runc -Version: 0.1.1 +Version: 0.1.1+git%{git_version} Release: 0 Summary: Tool for spawning and running OCI containers License: Apache-2.0 Group: System/Management Url: https://github.com/opencontainers/runc -Source: %{name}-%{version}.tar.xz -Patch0: seccomp-use-pkg-config.patch +Source: %{name}-git.%{git_version}.tar.xz %ifarch %go_arches BuildRequires: go >= 1.5 BuildRequires: go-go-md2man %else -BuildRequires: gcc5-go >= 5.0 +BuildRequires: gcc6-go >= 6.1 %endif BuildRequires: libapparmor-devel # Seccomp isn't supported on aarch64. @@ -64,7 +75,7 @@ Requires: go >= 1.5 Requires: go-go-md2man %else -Requires: gcc5-go >= 5.0 +Requires: gcc6-go >= 6.1 %endif Requires: libapparmor-devel # Seccomp isn't supported on aarch64. @@ -79,35 +90,50 @@ Test package for runc. It contains the source code and the tests. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-git.%{git_version} # Apply the vendor'd patch to the right subdirectory. -%patch0 -p1 -d Godeps/_workspace/src/github.com/seccomp/libseccomp-golang %build # Do not use symlinks. If you want to run the unit tests for this package at # some point during the build and you need to directly use go list directly it # will get confused by symlinks. -export GOPATH=${HOME}/go:${HOME}/go/src/github.com/opencontainers/runc/Godeps/_workspace:${GOPATH} +export GOPATH=${HOME}/go:${HOME}/go/src/github.com/opencontainers/runc/Godeps/_workspace mkdir -pv $HOME/go/src/github.com/opencontainers/runc rm -rf $HOME/go/src/github.com/opencontainers/runc/* cp -avr * $HOME/go/src/github.com/opencontainers/runc +export BUILDFLAGS="-gccgoflags=-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl -lselinux -lapparmor" # Build all features. export BUILDTAGS="apparmor selinux" # Seccomp isn't supported on aarch64. %ifnarch aarch64 export BUILDTAGS="$BUILDTAGS seccomp" +export BUILDFLAGS="$BUILDFLAGS -lseccomp" %endif # Build runc. -%go_tool build %GO_BUILD_FLAGS -tags "$BUILDTAGS" -x -o %{name}-%{version} github.com/opencontainers/%{name} +%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 +PKG_LIST=$(go list ./... \ + | grep -v 'github.com/opencontainers/runc/libcontainer/cgroups/fs$' \ + | grep -v 'github.com/opencontainers/runc/libcontainer$' \ + | grep -v 'github.com/opencontainers/runc/libcontainer/integration$' \ + | grep -v 'github.com/opencontainers/runc/libcontainer/nsenter$' \ + | 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} install -d -m755 %{buildroot}/usr/src/runc/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qSUnuG/_old 2016-09-21 18:49:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qSUnuG/_new 2016-09-21 18:49:21.000000000 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/opencontainers/runc.git</param> <param name="scm">git</param> <param name="filename">runc</param> - <param name="versionformat">0.1.1</param> - <param name="revision">v0.1.1</param> + <param name="versionformat">git.%h</param> + <param name="revision">cc29e3dded8e27ba8f65738f40d251c885030a28</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled">
