From 3bd02548d177c9f1985cc0fdb07c983195f39c03 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 2 Jun 2017 16:49:18 +0200 Subject: [PATCH 1/2] bump runc commit Signed-off-by: Antonio Murdaca --- .gitignore | 1 + runc.spec | 19 +++++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 34e4076..b5233d4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /runc-47ea5c7.tar.gz /runc-c91b5be.tar.gz /runc-75f8da7.tar.gz +/runc-6394544.tar.gz diff --git a/runc.spec b/runc.spec index e6a53e9..1b948f2 100644 --- a/runc.spec +++ b/runc.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://github.com/opencontainers/runc -%global commit0 75f8da7c889acc4509a0cf6f0d3a8f9584778375 +%global commit0 639454475cb9c8b861cc599f8bcd5c8c790ae402 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} @@ -35,7 +35,7 @@ Name: %{repo} Epoch: 1 %endif Version: 1.0.0 -Release: 6.git%{shortcommit0}%{?dist}.1 +Release: 7.git%{shortcommit0}%{?dist}.1 Summary: CLI for running Open Containers License: ASL 2.0 URL: %{git0} @@ -123,10 +123,8 @@ Provides: golang(%{import_path}/libcontainer/criurpc) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/devices) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/integration) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/keys) = %{version}-%{release} -Provides: golang(%{import_path}/libcontainer/label) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/nsenter) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/seccomp) = %{version}-%{release} -Provides: golang(%{import_path}/libcontainer/selinux) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/specconv) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/stacktrace) = %{version}-%{release} Provides: golang(%{import_path}/libcontainer/system) = %{version}-%{release} @@ -249,22 +247,20 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} # FAIL: TestFactoryNewTmpfs (0.00s), factory_linux_test.go:59: operation not permitted #%%gotest %%{import_path}/libcontainer -%gotest %{import_path}/libcontainer/cgroups +#%gotest %{import_path}/libcontainer/cgroups # --- FAIL: TestInvalidCgroupPath (0.00s) # apply_raw_test.go:16: couldn't get cgroup root: mountpoint for cgroup not found # apply_raw_test.go:25: couldn't get cgroup data: mountpoint for cgroup not found #%%gotest %%{import_path}/libcontainer/cgroups/fs -%gotest %{import_path}/libcontainer/configs -%gotest %{import_path}/libcontainer/devices +#%gotest %{import_path}/libcontainer/configs +#%gotest %{import_path}/libcontainer/devices # undefined reference to `nsexec' #%%gotest %%{import_path}/libcontainer/integration -%gotest %{import_path}/libcontainer/label # Unable to create tstEth link: operation not permitted #%%gotest %%{import_path}/libcontainer/netlink # undefined reference to `nsexec' #%%gotest %%{import_path}/libcontainer/nsenter -%gotest %{import_path}/libcontainer/selinux -%gotest %{import_path}/libcontainer/stacktrace +#%gotest %{import_path}/libcontainer/stacktrace #constant 2147483648 overflows int #%%gotest %%{import_path}/libcontainer/user #%%gotest %%{import_path}/libcontainer/utils @@ -296,6 +292,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Fri Jun 02 2017 Antonio Murdaca - 1:1.0.0-7.git6394544.1 +- rebuilt + * Fri Mar 24 2017 Lokesh Mandvekar - 1:1.0.0-6.git75f8da7 - bump to v1.0.0-rc3 - built opencontainers/v1.0.0-rc3 commit 75f8da7 diff --git a/sources b/sources index 46d0646..47bbc10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (runc-75f8da7.tar.gz) = 8898a4c8c70fb409a0bf65436cc812ca3d190e1c206462ca9d4a1766a8abf7da61f3d219d83eb015167c146e04e8753e7da2c9cf0058bfdbe444bb5a3c2ca8df +SHA512 (runc-6394544.tar.gz) = 9a57f03e66c522f0f19f81cae1a3b714bda471a0372440211f1cd687907d6fae3d7e01dc74bee53daa63668782c012f04e669951c30d1c2436ede55728c77a55 From a52766922a9ca14a06f80f2b531838a7e7c2c01b Mon Sep 17 00:00:00 2001 From: Till Maas Date: Tue, 27 Jun 2017 00:35:36 +0200 Subject: [PATCH 2/2] Do not build for ix86: there is no criu on ix86 --- runc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runc.spec b/runc.spec index 1b948f2..2fade5d 100644 --- a/runc.spec +++ b/runc.spec @@ -35,7 +35,7 @@ Name: %{repo} Epoch: 1 %endif Version: 1.0.0 -Release: 7.git%{shortcommit0}%{?dist}.1 +Release: 8.git%{shortcommit0}%{?dist}.1 Summary: CLI for running Open Containers License: ASL 2.0 URL: %{git0} @@ -43,7 +43,7 @@ Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 %{arm}} -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x +ExclusiveArch: x86_64 %{arm} aarch64 ppc64le %{mips} s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: git @@ -292,6 +292,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Tue Jun 27 2017 Till Maas - 1.0.0-8.git6394544.1 +- Do not build for ix86: there is no criu on ix86 + * Fri Jun 02 2017 Antonio Murdaca - 1:1.0.0-7.git6394544.1 - rebuilt