Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Also build for CentOS 9. #283

Merged
merged 1 commit into from
May 4, 2022
Merged

Also build for CentOS 9. #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def images = [
[image: "docker.io/library/amazonlinux:2", arches: ["aarch64"]],
[image: "docker.io/library/centos:7", arches: ["amd64", "aarch64"]],
[image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]],
[image: "quay.io/centos/centos:stream9", arches: ["amd64", "aarch64"]],
[image: "docker.io/library/debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024)
[image: "docker.io/library/debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (Next stable)
[image: "docker.io/library/fedora:34", arches: ["amd64", "aarch64"]], // EOL: May 17, 2022
Expand Down
14 changes: 8 additions & 6 deletions rpm/containerd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ AutoReq: no

Name: containerd.io
Provides: containerd
# For some reason on rhel 8 if we "provide" runc then it makes this package unsearchable
%if 0%{!?el8:1}
# For some reason on rhel >= 8 if we "provide" runc then it makes this package unsearchable
%if %{undefined rhel} || 0%{?rhel} < 8
Provides: runc
%endif

Expand Down Expand Up @@ -69,11 +69,12 @@ BuildRequires: gcc
BuildRequires: systemd
BuildRequires: libseccomp-devel

# Should only return true if `el8` (rhel8) is NOT defined
%if 0%{!?el8:1}
%if 0%{?suse_version}
%if %{undefined rhel} || 0%{?rhel} < 8
%if %{defined suse_version}
# SUSE flavors
BuildRequires: libbtrfs-devel
%else
# Fedora / others, and CentOS/RHEL < 8
BuildRequires: btrfs-progs-devel
%endif
%endif
Expand Down Expand Up @@ -109,7 +110,8 @@ cd %{_topdir}/BUILD
GO111MODULE=auto make man

BUILDTAGS="seccomp selinux"
%if 1%{!?el8:1}
%if %{defined rhel} && 0%{?rhel} >= 8
# btrfs support was removed in CentOS/RHEL 8
BUILDTAGS="${BUILDTAGS} no_btrfs"
%endif

Expand Down