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=7e7e9f97e421....
Change:
-ExclusiveArch: x86_64 aarch64 ppc64le s390x
Thanks.
Full change:
============
commit 7e7e9f97e421f2d4c31abfa0a293f944abedab9c
Author: Daniel J Walsh <dwalsh(a)redhat.com>
Date: Thu Aug 3 13:18:27 2017 +0000
Beta Release
Additional registry support
Daemon pids-limit support
cri-o daemon now supports a default pid-limit on all containers to prevent
fork-bombs. This is configurable by admins through a flag or /etc/crio/crio.conf
Configurable image volume support
Bugs and Stability fixes
OCI 1.0 runtime support
Dropped internal runc, and now use systems runc
diff --git a/.gitignore b/.gitignore
index 75bb9e2..3c56866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
-/cri-o-5dcbdc0.tar.gz
+/cri-o-c0fb3d9.tar.gz
/runc-67bd2ab.tar.gz
+/cri-o-5dcbdc0.tar.gz
/plugins-dcf7368.tar.gz
+/cri-o-91977d3.tar.gz
+/cri-o-fa25b38.tar.gz
+/cri-o-66d96e7.tar.gz
diff --git a/cri-o.spec b/cri-o.spec
index ef30059..99773ee 100644
--- a/cri-o.spec
+++ b/cri-o.spec
@@ -25,36 +25,23 @@
#
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 66d96e77e33bf773781e2a8313e8a73b9c679caa
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-# runc
-%global git_runc
https://github.com/opencontainers/runc/
-%global commit_runc 67bd2ab554bdf8a604f020e57448b37ef2102171
-%global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
-
-# CNI plugins
-%global git_cni
https://github.com/containernetworking/plugins
-%global commit_cni dcf7368eeab15e2affc6256f0bb1e84dd46a34de
-%global shortcommit_cni %(c=%{commit_cni}; echo ${c:0:7})
-
%global service_name crio
Name: cri-o
-Version: 1.0.0.alpha.0
-Release: 0.git%{shortcommit0}%{?dist}.3
+Version: 1.0.0.beta.0
+Release: 1.git%{shortcommit0}%{?dist}
Summary: OCI-based implementation of Kubernetes Container Runtime Interface
License: ASL 2.0
URL: https://%{provider_prefix}
Source0:
https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-...
Source3: %{service_name}-network.sysconfig
Source4: %{service_name}-storage.sysconfig
-Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz
-Source6: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.tar.gz
+ExcludeArch: ppc64
+Provides: %{repo}
-# 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
# 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
@@ -69,10 +56,17 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: device-mapper-devel
Requires(pre): container-selinux
Requires: skopeo-containers
+Requires: runc >= runc-1.0.1
Provides: %{repo} = %{version}-%{release}
-Provides: cri-o
+Provides: %{service_name} = %{version}-%{release}
+Obsoletes: ocid <= 0.3
+Provides: ocid = %{version}-%{release}
-Recommends: cri-o-cni
+%if 0%{?centos}
+Requires: containernetworking-plugins >= 0.5.2-2
+%else
+Recommends: containernetworking-plugins >= 0.5.2-2
+%endif # centos
%description
%{summary}
@@ -420,30 +414,15 @@ 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
-
-tar zxf %{SOURCE5}
-tar zxf %{SOURCE6}
+%autosetup -Sgit -n %{name}-%{commit0}
+sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g'
contrib/systemd/%{service_name}.service
%build
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers}
ln -s $(dirs +1 -l) src/%{import_path}
-ln -s $(dirs +1 -l)/runc-%{commit_runc}
src/%{provider}.%{provider_tld}/opencontainers/runc
popd
ln -s vendor src
@@ -455,18 +434,9 @@ make binaries
./%{service_name} \
--selinux=true \
--storage-driver=overlay2 \
- --runtime /usr/libexec/%{service_name}/runc \
--conmon /usr/libexec/%{service_name}/conmon \
--cgroup-manager=systemd config > %{service_name}.conf
-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
@@ -478,11 +448,6 @@ install -p -m 755 kpod %{buildroot}%{_bindir}
install -p -m 755 conmon/conmon %{buildroot}%{_libexecdir}/%{service_name}
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
@@ -567,7 +532,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*
@@ -576,24 +541,47 @@ 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
-%{_libexecdir}/%{service_name}/runc
%{_unitdir}/%{service_name}.service
+%{_unitdir}/cri-o.service
%{_unitdir}/%{service_name}-shutdown.service
%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
+* Thu Aug 3 2017 Dan Walsh <dwalsh(a)redhat.com> - 1.0.0.beta.0-1.git66d96e7
+- Beta Release
+- Additional registry support
+- Daemon pids-limit support
+- cri-o daemon now supports a default pid-limit on all containers to prevent
fork-bombs. This is configurable by admins through a flag or /etc/crio/crio.conf
+- Configurable image volume support
+- Bugs and Stability fixes
+- OCI 1.0 runtime support
+- Dropped internal runc, and now use systems runc
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0.0.alpha.0-5.gitfa25b38
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0.0.alpha.0-4.gitfa25b38
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Lokesh Mandvekar <lsm5(a)fedoraproject.org> -
1.0.0.alpha.0-3.gitfa25b38
+- enable all arches except ppc64 because it's been removed from goarches
+
+* Thu Jul 13 2017 Lokesh Mandvekar <lsm5(a)fedoraproject.org> -
1.0.0.alpha.0-2.gitfa25b38
+- built commit fa25b38
+- Provides: crio
+
+* 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..575f86d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (cri-o-5dcbdc0.tar.gz) =
a1031c25efdd8ca8877f0a2f4371d0fb0d2fca56f21826c79a721e3d26a6b4434f81ac3501a5d3d2607a6109ed211c73f5e8a7d0454ef17cb476078e428cc928
SHA512 (plugins-dcf7368.tar.gz) =
59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab
-SHA512 (runc-67bd2ab.tar.gz) =
4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28
+SHA512 (cri-o-66d96e7.tar.gz) =
c83e52e33cf4a3146914b2f631092f2983c065845d98a681f3c1b2d7b9b92c5506de5051745bc3fa214b8c7321331d45c830bd088ffd81fefc11906c3591091c