Compare commits
204 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87d92a0ec4 | ||
|
|
3850bfc863 | ||
|
|
3d7a891f95 | ||
|
|
dc89cebb47 | ||
|
|
b69e768862 |
||
|
|
4c0b4c35e5 | ||
|
|
789f35272e | ||
|
|
0074295812 | ||
|
|
183a7b1633 | ||
|
|
ac7db51ac5 | ||
|
|
af9724800c | ||
|
|
715113b32b | ||
|
|
60b4a41ab7 | ||
|
|
998ffdad23 | ||
|
|
d0f8519e4d | ||
|
|
5caa0f2b16 | ||
|
|
7d8c30ed38 | ||
|
|
f0be83ef28 | ||
|
|
f25860a1c2 |
||
|
|
52078f228e |
||
|
|
ed1ce84574 | ||
|
|
0c0f019cc7 | ||
|
|
db43736e7d | ||
|
|
d6ff87ba32 | ||
|
|
f64e745fb5 | ||
|
|
5b10e3c19e | ||
|
|
617e508896 | ||
|
|
45210bdab1 | ||
|
|
788e8d6eb4 | ||
|
|
c84fc17596 | ||
|
|
59980bddfa |
||
|
|
c41fd8553d | ||
|
|
0dfc3b9f8d | ||
|
|
1048413046 | ||
|
|
6c2d8b6f0a | ||
|
|
d16ba5b200 | ||
| 6b5d63550a | |||
| 8a8c1bc6b2 | |||
|
|
5ec366ab35 | ||
|
|
486f8184bb | ||
|
|
97dc2869ab | ||
|
|
ec96171544 | ||
|
|
e1584e4b3b | ||
|
|
8b0d3fa88c | ||
|
|
5cb4173b93 | ||
|
|
cba0cc05cb | ||
|
|
900a60eb1b | ||
|
|
47eb2b6ece | ||
|
|
47d26c75af | ||
|
|
83e38e93da | ||
|
|
3aaeb32c89 | ||
|
|
c0926fc41b | ||
|
|
f5e63146f3 | ||
|
|
572f8aba64 | ||
|
|
26947381ca | ||
|
|
f23576258f | ||
|
|
f1f3ddf1cb | ||
|
|
3e8b25c53c | ||
|
|
b73f6bb538 | ||
|
|
7f05121b49 | ||
|
|
eaac9a809b | ||
|
|
2bce29896a | ||
|
|
5dadf85731 | ||
|
|
103b8a534c | ||
|
|
c35aab89f3 | ||
|
|
f3fb16e77a | ||
|
|
117b09b0fa | ||
|
|
f3149243f8 | ||
|
|
31a1e985a8 | ||
|
|
18e7bfff9b | ||
|
|
b6aa647987 | ||
|
|
78a5fd64a1 | ||
|
|
19f12dc95a | ||
|
|
aa1dd0d9aa | ||
|
|
e2091267e5 | ||
|
|
ba809568f3 | ||
|
|
8f9bc4d608 | ||
|
|
3f3d52ce94 | ||
|
|
e5c4b8113f | ||
|
|
419f6991cc | ||
|
|
92e65ab06f | ||
|
|
ce0b9dc836 | ||
|
|
f1747f4629 | ||
|
|
f98ea4f8a9 | ||
|
|
556df46c52 | ||
|
|
6ea94fbd06 | ||
|
|
f1e302b505 | ||
|
|
48d2d2ceb4 | ||
|
|
b9727dcda1 | ||
|
|
dd9d8004b6 | ||
|
|
eae6e6b239 | ||
|
|
a5b1dc96e9 | ||
|
|
d0a92bc75b | ||
|
|
e9b212833d | ||
|
|
77ac05b147 | ||
|
|
af3a7a4c43 | ||
|
|
dbb8718b8d | ||
|
|
22ea5bf565 | ||
|
|
e68fd5a215 | ||
|
|
3c83c90479 | ||
|
|
d69408eb7c | ||
|
|
d86bcfb575 | ||
|
|
acae6ac2a6 | ||
|
|
436037e932 | ||
|
|
aff2694ff6 | ||
|
|
88f5cb6f26 | ||
|
|
28d5e5bcbf | ||
|
|
9d1a46824e | ||
|
|
e637f8f07c | ||
|
|
211b481b05 | ||
|
|
55513cddf1 | ||
|
|
4f574ab340 | ||
|
|
fd7641c79a | ||
|
|
d30ce58377 | ||
|
|
185ff113ff | ||
|
|
b28851091c | ||
|
|
a591ee5e21 | ||
|
|
60b220dcad | ||
|
|
7ca8a21f39 | ||
|
|
5fd5344faa | ||
|
|
99ceb8cd5d | ||
|
|
e27d07f549 | ||
|
|
d3b9fee086 | ||
|
|
0ccf3151f3 | ||
|
|
ea87f6d49a | ||
|
|
b9179ce4fc |
||
|
|
0dc11f5a01 | ||
|
|
f5f37d5659 | ||
|
|
935740fbcc | ||
|
|
dede183e2f | ||
|
|
90a577a46e |
||
|
|
78dc2d287b |
||
|
|
17125f41ff | ||
|
|
4cf2482ca7 | ||
|
|
2e75949866 | ||
|
|
c0089e7060 | ||
|
|
feddf9c9de | ||
|
|
a9c59d3379 | ||
|
|
d9b59ef240 | ||
|
|
e621f5c14a | ||
|
|
125ca70870 | ||
|
|
0dfb7f1b69 | ||
|
|
7fdbe1e1ab | ||
|
|
b9c2486177 |
||
|
|
21021c20e9 | ||
|
|
5569063a9f | ||
|
|
2d46326ab8 | ||
|
|
6f630a2a7f | ||
|
|
4ef23ddae0 | ||
|
|
30a728de65 | ||
|
|
8f7f0ebaf6 |
||
|
|
17fdd2e06c |
||
|
|
1d6de9230b |
||
|
|
b28a6bcad5 | ||
|
|
aeb29ac23b | ||
|
|
603a13cf48 | ||
|
|
05c212a0ae | ||
|
|
a637d26633 | ||
|
|
e313e47177 |
||
|
|
a872723927 |
||
|
|
ef0e5ec550 | ||
|
|
04fff41156 |
||
|
|
11da5ede25 |
||
|
|
ecb7c348ee | ||
|
|
952333569c | ||
|
|
beb2a43159 | ||
|
|
5adf4fe3ac | ||
|
|
f627cbca1c | ||
|
|
5d56f219c7 | ||
|
|
f4809bf48f | ||
|
|
2c3f97a106 |
||
|
|
bc230224cb | ||
|
|
395affe08c | ||
|
|
af78346778 |
||
|
|
4ca57c0944 |
||
|
|
7a2cea75b9 | ||
|
|
57d274effb |
||
|
|
9df9c7b581 | ||
|
|
2bcc4e0975 | ||
|
|
31fd47bc52 | ||
|
|
9a8cdeb6ef | ||
|
|
d9c5ef635d | ||
|
|
8c6e7d747c | ||
|
|
113878be45 | ||
|
|
db3fbf2a3f | ||
|
|
3ed3a4c7f1 | ||
|
|
6015b56ab6 | ||
|
|
465b8baa32 | ||
|
|
a587369966 | ||
|
|
fd0f676547 | ||
|
|
6648c38490 | ||
|
|
34b5885cf0 | ||
|
|
aaa8f31ca5 | ||
|
|
cf9d4c2080 | ||
|
|
2a998dabfb | ||
|
|
ac7d86baa8 | ||
|
|
b74df5c475 | ||
|
|
347b56a909 |
||
|
|
7d25a267ab |
||
|
|
33548db9f9 |
||
|
|
0fd7781d58 |
||
|
|
4f7c19cbbc |
||
|
|
331cb946e7 |
||
|
|
74c8d12b07 |
6 changed files with 266 additions and 186 deletions
21
.gitignore
vendored
21
.gitignore
vendored
|
|
@ -29,6 +29,21 @@
|
|||
/v1.20.0.tar.gz
|
||||
/v1.20.1.tar.gz
|
||||
/v1.20.2.tar.gz
|
||||
/v1.20.5.tar.gz
|
||||
/v1.20.6.tar.gz
|
||||
/v1.20.7.tar.gz
|
||||
/cri-o-1.21.1.tar.gz
|
||||
/cri-o-1.21.2.tar.gz
|
||||
/cri-o-1.22.0.tar.gz
|
||||
/cri-o-1.22.1.tar.gz
|
||||
/cri-o-1.23.0.tar.gz
|
||||
/cri-o-1.23.1.tar.gz
|
||||
/cri-o-1.23.2.tar.gz
|
||||
/cri-o-1.24.1.tar.gz
|
||||
/cri-o-1.26.1.tar.gz
|
||||
/cri-o-1.27.0.tar.gz
|
||||
/cri-o-1.27.1.tar.gz
|
||||
/cri-o-1.28.0.tar.gz
|
||||
/cri-o-1.28.2.tar.gz
|
||||
/cri-o-1.29.2.tar.gz
|
||||
/cri-o-1.29.3.tar.gz
|
||||
/cri-o-1.29.4.tar.gz
|
||||
/cri-o-1.31.1.tar.gz
|
||||
/cri-o-1.32.0.tar.gz
|
||||
|
|
|
|||
422
cri-o.spec
422
cri-o.spec
|
|
@ -1,29 +1,22 @@
|
|||
%if 0%{?centos}
|
||||
%global with_debug 0
|
||||
%else
|
||||
%global with_debug 1
|
||||
%endif
|
||||
%global with_check 0
|
||||
|
||||
%if 0%{?with_debug}
|
||||
%global _find_debuginfo_dwz_opts %{nil}
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%else
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# https://github.com/cri-o/cri-o
|
||||
%global goipath github.com/cri-o/cri-o
|
||||
Version: 1.20.7
|
||||
%global service_name crio
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
||||
# Related: github.com/cri-o/cri-o/issues/3684
|
||||
%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ')
|
||||
%global git_tree_state clean
|
||||
%global criocli_path ""
|
||||
|
||||
Version: 1.32.0
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 9
|
||||
%define gobuild(o:) %{expand:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
|
||||
%global _dwz_low_mem_die_limit 0
|
||||
%ifnarch ppc64
|
||||
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
|
||||
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
|
||||
%else
|
||||
go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
|
||||
go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**};
|
||||
%endif
|
||||
}
|
||||
%bcond_with check
|
||||
|
|
@ -32,89 +25,76 @@ Version: 1.20.7
|
|||
%bcond_without check
|
||||
%endif
|
||||
|
||||
|
||||
# Global vars
|
||||
%global provider github
|
||||
%global provider_tld com
|
||||
%global project cri-o
|
||||
%global repo cri-o
|
||||
|
||||
# Related: github.com/cri-o/cri-o/issues/3684
|
||||
%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ')
|
||||
%global git_tree_state clean
|
||||
%global criocli_path ""
|
||||
|
||||
# https://github.com/cri-o/cri-o
|
||||
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||
|
||||
# Commit for the builds
|
||||
%global commit0 5d2fa3419f15655454edb94dfcc0993cb5a1521c
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
%global git0 https://%{import_path}
|
||||
%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167
|
||||
|
||||
# Services
|
||||
%global service_name crio
|
||||
Name: cri-o
|
||||
Epoch: 0
|
||||
Release: 5%{?dist}
|
||||
Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface
|
||||
|
||||
# Used for comparing with latest upstream tag
|
||||
# to decide whether to autobuild (non-rawhide only)
|
||||
%define built_tag v1.20.7
|
||||
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||
%define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.')
|
||||
%define download_url %{git0}/archive/%{built_tag}.tar.gz
|
||||
# Upstream license specification: Apache-2.0
|
||||
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
|
||||
License: Apache-2.0
|
||||
URL: https://github.com/cri-o/cri-o
|
||||
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Epoch: 0
|
||||
Name: %{repo}
|
||||
Release: 1%{?dist}
|
||||
ExcludeArch: ppc64
|
||||
Summary: Kubernetes Container Runtime Interface for OCI-based containers
|
||||
License: ASL 2.0
|
||||
URL: %{git0}
|
||||
Source0: %{download_url}
|
||||
Source3: %{service_name}-network.sysconfig
|
||||
Source4: %{service_name}-storage.sysconfig
|
||||
Source5: %{service_name}-metrics.sysconfig
|
||||
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
|
||||
BuildRequires: golang
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: golang >= 1.23
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
||||
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
|
||||
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
|
||||
%endif
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: btrfs-progs-devel
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: btrfs-progs-devel
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: go-rpm-macros
|
||||
%endif
|
||||
BuildRequires: git
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: glibc-static
|
||||
BuildRequires: git-core
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: glibc-static
|
||||
BuildRequires: go-md2man
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
BuildRequires: systemd-devel
|
||||
%else
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%endif
|
||||
BuildRequires: make
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: golang-github-cpuguy83-md2man
|
||||
Requires(pre): container-selinux
|
||||
%else
|
||||
BuildRequires: go-md2man
|
||||
Requires: container-selinux
|
||||
%endif
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libassuan-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: make
|
||||
%if 0%{?fedora}
|
||||
Requires(pre): container-selinux
|
||||
Requires: containers-common >= 1:0.1.31-14
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
Requires: runc >= 1.0.0-16
|
||||
Requires: containernetworking-plugins >= 1.0.0-1
|
||||
%else
|
||||
Requires: container-selinux
|
||||
Recommends: runc >= 1.0.0-16
|
||||
Suggests: containernetworking-plugins >= 1.0.0-1
|
||||
%endif
|
||||
Requires: containers-common >= 1:0.1.31-14
|
||||
%if 0%{?fedora} || 0%{?centos} >= 8
|
||||
Recommends: runc >= 1.0.0-16
|
||||
%else
|
||||
Requires: runc >= 1.0.0-16
|
||||
%endif
|
||||
Obsoletes: ocid <= 0.3
|
||||
Provides: ocid = %{epoch}:%{version}-%{release}
|
||||
Provides: %{service_name} = %{epoch}:%{version}-%{release}
|
||||
Requires: containernetworking-plugins >= 0.7.5-1
|
||||
Requires: conmon >= 2.0.2-1
|
||||
Requires: socat
|
||||
Requires: conmon >= 2.0.2-1
|
||||
Requires: socat
|
||||
|
||||
Obsoletes: ocid <= 0.3
|
||||
Provides: ocid = %{epoch}:%{version}-%{release}
|
||||
Provides: %{service_name} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description
|
||||
%{summary}
|
||||
Open Container Initiative-based implementation of Kubernetes Container Runtime
|
||||
Interface.
|
||||
|
||||
%prep
|
||||
%autosetup -Sgit -n %{repo}-%{built_tag_strip}
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 9
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
%else
|
||||
%goprep -k
|
||||
%endif
|
||||
|
||||
sed -i 's/install.config: crio.conf/install.config:/' Makefile
|
||||
sed -i 's/install.bin: binaries/install.bin:/' Makefile
|
||||
sed -i 's/install.man: $(MANPAGES)/install.man:/' Makefile
|
||||
|
|
@ -123,53 +103,47 @@ sed -i 's/module_/module-/' internal/version/version.go
|
|||
sed -i 's/\/local//' contrib/systemd/%{service_name}.service
|
||||
sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service
|
||||
|
||||
|
||||
%build
|
||||
export CGO_CFLAGS='-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64'
|
||||
%ifarch x86_64
|
||||
export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic"
|
||||
%if 0%{?fedora} || 0%{?centos} >= 8
|
||||
export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection"
|
||||
%global __golang_extldflags -Wl,-z,undefs
|
||||
|
||||
export GO111MODULE=on
|
||||
export GOFLAGS=-mod=vendor
|
||||
|
||||
export BUILDTAGS="containers_image_ostree_stub
|
||||
$(hack/btrfs_installed_tag.sh)
|
||||
$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh)
|
||||
$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)
|
||||
$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper"
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 8
|
||||
BUILDTAGS="$BUILDTAGS containers_image_openpgp"
|
||||
%endif
|
||||
|
||||
export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
|
||||
-X %{goipath}/internal/version.buildDate=%{build_timestamp}
|
||||
-X %{goipath}/internal/version.gitCommit=%{commit0}
|
||||
-X %{goipath}/internal/version.version=%{version}
|
||||
-X %{goipath}/internal/version.gitTreeState=%{git_tree_state} "
|
||||
|
||||
for cmd in cmd/* ; do
|
||||
%gobuild -o bin/$(basename $cmd) %{goipath}/$cmd
|
||||
done
|
||||
|
||||
%if 0%{?fedora}
|
||||
%set_build_flags
|
||||
%endif
|
||||
# These extra flags present in %%{optflags} have been skipped for now as they break the build
|
||||
#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"
|
||||
|
||||
mkdir _output
|
||||
pushd _output
|
||||
mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers}
|
||||
ln -s $(dirs +1 -l) src/%{import_path}
|
||||
popd
|
||||
|
||||
ln -s vendor src
|
||||
export GOPATH=$(pwd)/_output:$(pwd)
|
||||
export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)"
|
||||
export GO111MODULE=off
|
||||
|
||||
# FIX-ME we are doing a mimic of Makefile.
|
||||
# Related: github.com/cri-o/cri-o/issues/3684
|
||||
export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
|
||||
-X %{import_path}/internal/version.buildDate=%{build_timestamp}
|
||||
-X %{import_path}/internal/version.gitCommit=%{commit0}
|
||||
-X %{import_path}/internal/version.version=%{version}
|
||||
-X %{import_path}/internal/version.gitTreeState=%{git_tree_state}"
|
||||
|
||||
%gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name}
|
||||
%gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status
|
||||
|
||||
GO_MD2MAN=go-md2man %{__make} docs
|
||||
# work around until https://github.com/cri-o/cri-o/pull/4442 is accepted
|
||||
# we need to drop -static for Stack Canary, Relro, and PIE
|
||||
sed -i 's/-static//g' pinns/Makefile
|
||||
CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpie -pie -fstack-protector -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now" %{__make} bin/pinns
|
||||
export CFLAGS="$CFLAGS -std=c99"
|
||||
%make_build bin/pinns
|
||||
GO_MD2MAN=go-md2man make docs
|
||||
|
||||
%install
|
||||
sed -i 's/\/local//' contrib/systemd/%{service_name}.service
|
||||
./bin/%{service_name} \
|
||||
bin/%{service_name} \
|
||||
--selinux \
|
||||
--cgroup-manager "systemd" \
|
||||
--cni-plugin-dir /opt/cni/bin \
|
||||
--cni-plugin-dir "%{_libexecdir}/cni" \
|
||||
--enable-metrics \
|
||||
--metrics-port 9537 \
|
||||
config > %{service_name}.conf
|
||||
|
||||
# install binaries
|
||||
|
|
@ -178,8 +152,8 @@ install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir}
|
|||
|
||||
# install conf files
|
||||
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
|
||||
install -p -m 644 contrib/cni/10-crio-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conflist
|
||||
install -p -m 644 contrib/cni/99-loopback.conflist %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conflist
|
||||
|
||||
install -dp %{buildroot}%{_sysconfdir}/%{service_name}
|
||||
install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d
|
||||
|
|
@ -189,75 +163,51 @@ install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name}
|
|||
install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf
|
||||
install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir}
|
||||
|
||||
install -dp %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -p -m 644 contrib/sysconfig/%{service_name} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}
|
||||
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network
|
||||
install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage
|
||||
install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-metrics
|
||||
|
||||
make PREFIX=%{buildroot}%{_usr} DESTDIR=%{buildroot} \
|
||||
%make_install PREFIX=%{buildroot}%{_prefix} \
|
||||
install.bin \
|
||||
install.completions \
|
||||
install.config \
|
||||
install.man \
|
||||
install.systemd
|
||||
|
||||
%if 0%{?centos} <= 7 || 0%{?rhel} <= 7
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17
|
||||
install -d -p %{buildroot}%{_usr}/lib/sysctl.d
|
||||
echo "fs.may_detach_mounts=1" > %{buildroot}%{_usr}/lib/sysctl.d/99-cri-o.conf
|
||||
install -d -p %{buildroot}%{_prefix}/lib/sysctl.d
|
||||
echo "fs.may_detach_mounts=1" > %{buildroot}%{_prefix}/lib/sysctl.d/99-cri-o.conf
|
||||
%endif
|
||||
|
||||
install -dp %{buildroot}%{_sharedstatedir}/containers
|
||||
#install -dp %%{buildroot}%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe
|
||||
#install -dp %%{buildroot}%%{_usr}/lib/systemd/system-preset
|
||||
|
||||
%check
|
||||
%if 0%{?with_check}
|
||||
export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace
|
||||
%endif
|
||||
|
||||
%post
|
||||
# Old verions of kernel do not reconigze metacopy option.
|
||||
# Old verions of kernel do not recognize metacopy option.
|
||||
# Reference: github.com/cri-o/cri-o/issues/3631
|
||||
%if ! 0%{?fedora} && (0%{?centos} <= 7 || 0%{?rhel} <= 7)
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf
|
||||
%sysctl_apply 99-cri-o.conf
|
||||
%endif
|
||||
ln -sf %{_unitdir}/%{service_name}.service %{_unitdir}/%{repo}.service
|
||||
%systemd_post %{service_name}
|
||||
|
||||
%preun
|
||||
%systemd_preun %{service_name}
|
||||
|
||||
%postun
|
||||
rm -f %{_unitdir}/%{repo}.service
|
||||
%systemd_postun_with_restart %{service_name}
|
||||
|
||||
#define license tag if not already defined
|
||||
%{!?_licensedir:%global license %doc}
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%license LICENSE vendor/modules.txt
|
||||
%doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md
|
||||
%doc awesome.md transfer.md
|
||||
%{_bindir}/%{service_name}
|
||||
%{_bindir}/%{service_name}-status
|
||||
%{_bindir}/pinns
|
||||
%{_mandir}/man5/%{service_name}.conf*5*
|
||||
%{_mandir}/man8/%{service_name}*.8*
|
||||
%dir %{_sysconfdir}/%{service_name}
|
||||
%config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-metrics
|
||||
%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf
|
||||
%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf
|
||||
%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conflist
|
||||
%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conflist
|
||||
%config(noreplace) %{_sysconfdir}/crictl.yaml
|
||||
%dir %{_libexecdir}/%{service_name}
|
||||
%{_unitdir}/%{service_name}.service
|
||||
%{_unitdir}/%{repo}.service
|
||||
%{_unitdir}/%{service_name}-shutdown.service
|
||||
%{_unitdir}/%{service_name}-wipe.service
|
||||
%dir %{_sharedstatedir}/containers
|
||||
%dir %{_datadir}/containers
|
||||
|
|
@ -269,24 +219,148 @@ rm -f %{_unitdir}/%{repo}.service
|
|||
%{_datadir}/bash-completion/completions/%{service_name}*
|
||||
%{_datadir}/fish/completions/%{service_name}*.fish
|
||||
%{_datadir}/zsh/site-functions/_%{service_name}*
|
||||
%if 0%{?centos} <= 7 || 0%{?rhel} <= 7
|
||||
%{_usr}/lib/sysctl.d/99-cri-o.conf
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%{_prefix}/lib/sysctl.d/99-cri-o.conf
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 15 2022 Peter Hunt <pehunt@redhat.com> - 0:1.20.7-1
|
||||
- bump to v1.20.7
|
||||
* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 0:1.32.0-5
|
||||
- rebuild
|
||||
|
||||
* Fri Dec 03 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.6-2
|
||||
- fix gobuild macros to set debug symbols right
|
||||
* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 0:1.32.0-4
|
||||
- Rebuild for golang-1.25.0
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.32.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Dec 23 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.32.0-1
|
||||
- Bump to v1.32.0
|
||||
- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860
|
||||
- Update BUILDTAGS to conform to upstream
|
||||
|
||||
* Thu Oct 24 2024 Dennis Gilmore <dennis@ausil.us> - 0:1.31.1-1
|
||||
- update to 1.31.1
|
||||
|
||||
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 0:1.29.4-3
|
||||
- convert license to SPDX
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.29.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Apr 30 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.29.4-1
|
||||
- Bump to v1.29.4
|
||||
- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime.
|
||||
|
||||
* Sat Apr 27 2024 Bradley G Smith <bradley.g.smith@gmail.com> - 0:1.29.3-1
|
||||
- Bump to v1.29.3
|
||||
- Add support for autogenerated bundled provides
|
||||
- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed.
|
||||
|
||||
* Thu Mar 21 2024 Peter Hunt <pehunt@redhat.com> - 0:1.29.2-1
|
||||
- bump to v1.29.2
|
||||
|
||||
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-5
|
||||
- Rebuild for golang 1.22.0
|
||||
|
||||
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0:1.28.2-4
|
||||
- Rebuild for golang 1.22.0
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.28.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Dec 04 2023 Christian Glombek <cglombek@redhat.com> - 0:1.28.2-1
|
||||
- bump to v1.28.2
|
||||
|
||||
* Thu Aug 24 2023 Peter Hunt <pehunt@redhat.com> - 0:1.28.0-1
|
||||
- bump to v1.28.0
|
||||
|
||||
* Thu Jul 20 2023 T K Chandra Hasan <t.k.chandra.hasan@ibm.com> - 0:1.27.1-1
|
||||
- bump to v1.27.1
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.27.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Apr 25 2023 Peter Hunt <pehunt@redhat.com> - 0:1.27.0-1
|
||||
- bump to v1.27.0
|
||||
|
||||
* Wed Jan 25 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.1-2
|
||||
- update for obs
|
||||
|
||||
* Tue Jan 10 2023 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.1-1
|
||||
- bump to v1.26.1
|
||||
|
||||
* Fri Dec 23 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.26.0-1
|
||||
- bump to v1.26.0
|
||||
|
||||
* Fri Oct 07 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.1-1
|
||||
- bump to v1.25.1
|
||||
|
||||
* Mon Aug 29 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.0-1
|
||||
- bump to v1.25.0
|
||||
|
||||
* Mon Aug 29 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.25.0-1
|
||||
- bump to v1.25.0
|
||||
|
||||
* Tue Aug 09 2022 Peter Hunt~ <pehunt@redhat.com> - 0:1.24.2-1
|
||||
- bump to v1.24.2
|
||||
|
||||
* Mon Jun 06 2022 Peter Hunt <pehunt@redhat.com> - 0:1.24.1-1
|
||||
- bump to v1.24.1
|
||||
|
||||
* Wed May 11 2022 Peter Hunt <pehunt@redhat.com> - 0:1.24.0-1
|
||||
- bump to v1.24.0
|
||||
|
||||
* Tue Mar 15 2022 Peter Hunt <pehunt@redhat.com> - 0:1.23.2-1
|
||||
- bump to v1.23.2
|
||||
|
||||
* Tue Mar 15 2022 Peter Hunt <pehunt@redhat.com> - 0:1.23.2-1
|
||||
- bump to v1.23.2
|
||||
|
||||
* Fri Feb 11 2022 Peter Hunt <pehunt@redhat.com> - 0:1.23.1-1
|
||||
- bump to v1.23.1
|
||||
|
||||
* Fri Feb 11 2022 Peter Hunt <pehunt@redhat.com> - 0:1.23.1-1
|
||||
- bump to v1.23.1
|
||||
|
||||
* Fri Dec 17 2021 Peter Hunt <pehunt@redhat.com> - 0:1.23.0-1
|
||||
- bump to v1.23.0
|
||||
|
||||
* Fri Dec 03 2021 Peter Hunt <pehunt@redhat.com> - 0:1.22.1-2
|
||||
- fix bogus date
|
||||
- fix broken macro
|
||||
|
||||
* Thu Nov 11 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.6-1
|
||||
- bump to v1.20.6
|
||||
* Thu Nov 11 2021 Peter Hunt <pehunt@redhat.com> - 0:1.22.1-1
|
||||
- bump to v1.22.1
|
||||
|
||||
* Thu Sep 16 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.5-2
|
||||
- bump to 1.20.5
|
||||
* Mon Nov 08 2021 Peter Hunt <pehunt@redhat.com> - 0:1.22.0-4
|
||||
- update golang version
|
||||
|
||||
* Mon Sep 13 2021 Peter Hunt <pehunt@redhat.com> - 0:1.22.0-3
|
||||
- fix spec
|
||||
|
||||
* Wed Aug 25 2021 Peter Hunt <pehunt@redhat.com> - 0:1.22.0-2
|
||||
- bump to v1.22.0
|
||||
|
||||
* Tue Jul 20 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.2-1
|
||||
- bump to v1.21.2
|
||||
|
||||
* Mon Jul 19 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.1-1
|
||||
- bump to v1.21.1
|
||||
|
||||
* Tue Jun 22 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-3
|
||||
- update spec to be more conformant for fedora
|
||||
|
||||
* Wed Apr 14 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-2
|
||||
- Use crio config for metrics configuration
|
||||
- drop systemd from crio configuration
|
||||
|
||||
* Wed Apr 14 2021 Peter Hunt <pehunt@redhat.com> - 0:1.21.0-1
|
||||
- Bump to v1.21.0
|
||||
|
||||
* Wed Mar 24 2021 Peter Hunt <pehunt@redhat.com> - 0:1.20.2-1
|
||||
- Bump to v1.20.2
|
||||
|
|
@ -591,7 +665,7 @@ rm -f %{_unitdir}/%{repo}.service
|
|||
- Configurable image volume support
|
||||
- Bugs and Stability fixes
|
||||
- OCI 1.0 runtime support
|
||||
- Dropped internal runc, and now use systems runc
|
||||
- Dropped internal runc, and now use systems runc
|
||||
|
||||
* Fri Jun 30 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0.alpha.0-1.git91977d3
|
||||
- built commit 91977d3
|
||||
|
|
@ -676,5 +750,3 @@ rm -f %{_unitdir}/%{repo}.service
|
|||
|
||||
* Tue Nov 08 2016 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-0.1.gitc57530e
|
||||
- First package for Fedora
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
# /etc/sysconfig/crio-metrics
|
||||
CRIO_METRICS_OPTIONS="--enable-metrics=true --metrics-port=9537"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# /etc/sysconfig/crio-network
|
||||
|
||||
CRIO_NETWORK_OPTIONS=
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
# /etc/sysconfig/crio-storage
|
||||
CRIO_STORAGE_OPTIONS=
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v1.20.7.tar.gz) = 2748e50315cc0ded2061667e800ce440a0b6e2b9f679be76a7cba6d54daa8f50dbe9447a00d889e971f1687eaa95ceee85253f3b5b7a7b73143f9701295078e0
|
||||
SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue