The package rpms/cri-o.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cri-o.git/commit/?id=b9179ce4fc71....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 0ccf3151f387b6df97a08ee6a93f8cc773198ad0
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 10:26:39 2018 -0400
cri-o-2:1.10.0-3.gitb0f6d98
- built commit b0f6d98
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index f0ead0c..0ea885a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
/cri-o-4d7e7dc.tar.gz
/cri-o-8723732.tar.gz
/cri-o-c956614.tar.gz
+/cri-o-b0f6d98.tar.gz
diff --git a/cri-o.spec b/cri-o.spec
index c1636b7..720319d 100644
--- a/cri-o.spec
+++ b/cri-o.spec
@@ -27,7 +27,7 @@
#
https://github.com/kubernetes-incubator/cri-o
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit0 c956614baec8a13c72169c127343128c29d8b035
+%global commit0 b0f6d98b9435c094a24fe55c3e75f3daff7196ee
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global service_name crio
@@ -37,7 +37,7 @@ Name: cri-o
Epoch: 2
%endif
Version: 1.10.0
-Release: 2.git%{shortcommit0}%{?dist}
+Release: 3.git%{shortcommit0}%{?dist}
Summary: Kubernetes Container Runtime Interface for OCI-based containers
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -504,6 +504,9 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%{_libexecdir}/%{service_name}/conmon
%changelog
+* Mon Mar 26 2018 Lokesh Mandvekar <lsm5(a)fedoraproject.org> -
2:1.10.0-3.gitb0f6d98
+- built commit b0f6d98
+
* Fri Mar 16 2018 Dan Walsh <dwalsh(a)redhat.com> - 2:1.10.0-beta.1
- bump to v1.10.0-beta.1
diff --git a/sources b/sources
index b041d99..f53d70e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cri-o-c956614.tar.gz) =
ee485caf0d4151368af98a0fa29248194f335117a1a18c70e5c2affd95ad30a95d69f53f89d4c47499754abe961115a25f1c076996a86b94368a59cc6e9db126
+SHA512 (cri-o-b0f6d98.tar.gz) =
cd1637165ee66fbff8832d199d8376f6e49fa6410109c4b3ca7365c40ea78f48c5d6b27276712dc072cf891314a5d85fa1749355e5addc9a0d36083549de431c
commit ea87f6d49aac8339087c2cfe4b7c4cf3edd07105
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 10:24:10 2018 -0400
update Makefile targets for conmon and pause
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/cri-o.spec b/cri-o.spec
index 22cfd14..c1636b7 100644
--- a/cri-o.spec
+++ b/cri-o.spec
@@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath}
export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh)
$(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub"
GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name}
%{import_path}/cmd/%{service_name}
-BUILDTAGS=$BUILDTAGS make conmon pause docs
+BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs
./bin/%{service_name} \
--selinux=true \
commit b9179ce4fc711754b203acea01a0a74f7e152832
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Mon Mar 26 09:59:14 2018 -0400
build from master branch
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/cri-o.spec b/cri-o.spec
index e5edce4..22cfd14 100644
--- a/cri-o.spec
+++ b/cri-o.spec
@@ -36,48 +36,48 @@ Name: cri-o
%if 0%{?fedora}
Epoch: 2
%endif
-Version: 1.10.0
-Release: 1.beta.1.git%{shortcommit0}%{?dist}
-Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based
containers
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
-Source3: %{service_name}-network.sysconfig
-Source4: %{service_name}-storage.sysconfig
-ExcludeArch: ppc64
+Version: 1.10.0
+Release: 2.git%{shortcommit0}%{?dist}
+Summary: Kubernetes Container Runtime Interface for OCI-based containers
+License: ASL 2.0
+URL: https://%{provider_prefix}
+Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+Source3: %{service_name}-network.sysconfig
+Source4: %{service_name}-storage.sysconfig
+ExcludeArch: ppc64
# 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: btrfs-progs-devel
-BuildRequires: git
-BuildRequires: glib2-devel
-BuildRequires: glibc-static
-BuildRequires: go-md2man
-BuildRequires: gpgme-devel
-BuildRequires: libassuan-devel
-BuildRequires: pkgconfig(systemd)
-BuildRequires: device-mapper-devel
-BuildRequires: make
-Requires(pre): container-selinux
-Requires: socat
-Requires: iptables
-Requires: iproute
-Requires: conmon
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires: btrfs-progs-devel
+BuildRequires: git
+BuildRequires: glib2-devel
+BuildRequires: glibc-static
+BuildRequires: go-md2man
+BuildRequires: gpgme-devel
+BuildRequires: libassuan-devel
+BuildRequires: pkgconfig(systemd)
+BuildRequires: device-mapper-devel
+BuildRequires: make
+Requires(pre): container-selinux
+Requires: socat
+Requires: iptables
+Requires: iproute
+Requires: conmon
%if 0%{?fedora}
-BuildRequires: libseccomp-static
-Requires: runc >= 2:1.0.0-15
-Requires: skopeo-containers >= 0.1.24-6
-Recommends: containernetworking-plugins >= 0.5.2-7
-Provides: %{service_name} = %{epoch}:%{version}-%{release}
-Provides: ocid = %{epoch}:%{version}-%{release}
+BuildRequires: libseccomp-static
+Requires: runc >= 2:1.0.0-15
+Requires: skopeo-containers >= 0.1.24-6
+Recommends: containernetworking-plugins >= 0.5.2-7
+Provides: %{service_name} = %{epoch}:%{version}-%{release}
+Provides: ocid = %{epoch}:%{version}-%{release}
%else
-BuildRequires: libseccomp-devel
-Requires: runc >= 1.0.0-15
-Requires: skopeo-containers >= 1:0.1.24-6
-Requires: containernetworking-plugins >= 0.5.2-7
-Provides: %{service_name} = %{version}-%{release}
-Provides: ocid = %{version}-%{release}
+BuildRequires: libseccomp-devel
+Requires: runc >= 1.0.0-15
+Requires: skopeo-containers >= 1:0.1.24-6
+Requires: containernetworking-plugins >= 0.5.2-7
+Provides: %{service_name} = %{version}-%{release}
+Provides: ocid = %{version}-%{release}
%endif
-Obsoletes: ocid <= 0.3
+Obsoletes: ocid <= 0.3
%description
%{summary}
@@ -327,12 +327,12 @@ conmon is an OCI container runtime monitor.
%if 0%{?with_integration_tests}
%package integration-tests
-Summary: Integration tests for %{name}
-Requires: %{service_name} = %{epoch}:%{version}-%{release}
-Requires: bats
-Requires: containernetworking-cni
-Requires: nmap-ncat
-Requires: socat
+Summary: Integration tests for %{name}
+Requires: %{service_name} = %{epoch}:%{version}-%{release}
+Requires: bats
+Requires: containernetworking-cni
+Requires: nmap-ncat
+Requires: socat
%description integration-tests
%{summary}