From 2a998dabfb32e2a929c1eea90a7821598549e621 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Fri, 30 Jun 2017 13:51:12 -0400
Subject: cri-o-1.0.0.alpha.0-1.git91977d3
- built commit 91977d3
- remove cri-o-cni subpackage
- require containernetworking-plugins >= 0.5.2-2 (same as containernetworking-cni)
- skip s390x build (rhbz#1466865)
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
---
.gitignore | 1 +
cri-o.spec | 51 +++++++++++++++++----------------------------------
sources | 2 +-
3 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2373cff..25d452e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/runc-67bd2ab.tar.gz
/cri-o-5dcbdc0.tar.gz
/plugins-dcf7368.tar.gz
+/cri-o-91977d3.tar.gz
diff --git a/cri-o.spec b/cri-o.spec
index 0373369..038454f 100644
--- a/cri-o.spec
+++ b/cri-o.spec
@@ -25,7 +25,7 @@
#
https://github.com/kubernetes-incubator/cri-o
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit0 5dcbdc05e597098381f138061a05810f5a000f39
+%global commit0 91977d3989d1bec715ec8063f447d143e7612d18
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# runc
@@ -42,7 +42,7 @@
Name: cri-o
Version: 1.0.0.alpha.0
-Release: 0.git%{shortcommit0}%{?dist}.3
+Release: 1.git%{shortcommit0}%{?dist}
Summary: OCI-based implementation of Kubernetes Container Runtime Interface
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -54,7 +54,8 @@
Source6: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.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: x86_64 aarch64 ppc64le s390x
+# skip s390x (rhbz#1466865)
+ExclusiveArch: x86_64 aarch64 ppc64le
# 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
@@ -75,9 +76,9 @@ Obsoletes: ocid <= 0.3
Provides: ocid = %{version}-%{release}
%if 0%{?centos}
-Requires: cri-o-cni
+Requires: containernetworking-plugins >= 0.5.2-2
%else
-Recommends: cri-o-cni
+Recommends: containernetworking-plugins >= 0.5.2-2
%endif # centos
%description
@@ -426,20 +427,9 @@ This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif
-%package cni
-License: LGPLv3
-Summary: CNI plugins for CRI-O
-Requires: %{name} = %{version}-%{release}
-
-%description cni
-CNI plugins and configurations for CRI-O.
-
-This package provides basic CNI plugins and basic configurations to be used with
-CRI-O.
-
%prep
-%setup -q -n cri-o-%{commit0}
-sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g'
contrib/systemd/crio.service
+%autosetup -Sgit -n %{name}-%{commit0}
+sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g'
contrib/systemd/%{service_name}.service
tar zxf %{SOURCE5}
tar zxf %{SOURCE6}
@@ -469,10 +459,6 @@ pushd
_build/src/github.com/opencontainers/runc
make BUILDTAGS="seccomp selinux"
popd
-pushd plugins-%{commit_cni}
-./build.sh
-popd
-
%install
make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd
install.completions
@@ -486,9 +472,6 @@ install -p -m 755 pause/pause
%{buildroot}%{_libexecdir}/%{service_name}
install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_libexecdir}/%{service_name}
-install -dp %{buildroot}/opt/cni/bin
-install -p -m 755 plugins-%{commit_cni}/bin/* %{buildroot}/opt/cni/bin
-
install -dp %{buildroot}%{_sysconfdir}/cni/net.d
install -p -m 644 contrib/cni/10-crio-bridge.conf
%{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf
install -p -m 644 contrib/cni/99-loopback.conf
%{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf
@@ -573,7 +556,7 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%doc README.md
%{_bindir}/%{service_name}
%{_bindir}/kpod
-%{_bindir}/crioctl
+%{_bindir}/%{service_name}ctl
%{_mandir}/man1/kpod*
%{_mandir}/man5/%{service_name}.conf.5*
%{_mandir}/man8/%{service_name}.8*
@@ -582,6 +565,8 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%config(noreplace) %{_sysconfdir}/%{service_name}/seccomp.json
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network
+%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf
+%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf
%dir %{_libexecdir}/%{service_name}
%{_libexecdir}/%{service_name}/conmon
%{_libexecdir}/%{service_name}/pause
@@ -591,15 +576,13 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%dir %{_sharedstatedir}/containers
%{_datadir}/bash-completion/completions/*
-%files cni
-%license plugins-%{commit_cni}/LICENSE
-%doc plugins-%{commit_cni}/README.md
-%dir %{_sysconfdir}/cni/net.d
-%{_sysconfdir}/cni/net.d/*
-%dir /opt/cni/bin
-/opt/cni/bin/*
-
%changelog
+* Fri Jun 30 2017 Lokesh Mandvekar <lsm5(a)fedoraproject.org> -
1.0.0.alpha.0-1.git91977d3
+- built commit 91977d3
+- remove cri-o-cni subpackage
+- require containernetworking-plugins >= 0.5.2-2 (same as containernetworking-cni)
+- skip s390x build (rhbz#1466865)
+
* Fri Jun 23 2017 Antonio Murdaca <runcom(a)fedoraproject.org> -
1.0.0.alpha.0-0.git5dcbdc0.3
- rebuilt to include cri-o-cni sub package
diff --git a/sources b/sources
index 78d11c4..08df226 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cri-o-5dcbdc0.tar.gz) =
a1031c25efdd8ca8877f0a2f4371d0fb0d2fca56f21826c79a721e3d26a6b4434f81ac3501a5d3d2607a6109ed211c73f5e8a7d0454ef17cb476078e428cc928
+SHA512 (cri-o-91977d3.tar.gz) =
03d621998f4659c3e07df2a0bb862a4e6fd02107986c92c0fe8daa74257298f7bddb4aec7a069d9f226a02139500ea8ff7469fc5c41e4b48b50ca5b712b75058
SHA512 (plugins-dcf7368.tar.gz) =
59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab
SHA512 (runc-67bd2ab.tar.gz) =
4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28
--
cgit v1.1
https://src.fedoraproject.org/cgit/cri-o.git/commit/?h=master&id=2a99...