Skip to content

Also build for CentOS 9. #270

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

Closed
Romain-Geissler-1A wants to merge 1 commit into from
Closed

Also build for CentOS 9. #270

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
18 changes: 3 additions & 15 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 0%{?rhel} <= 7
Copy link
Member

@thaJeztah thaJeztah Apr 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may also be excluding this rule on Fedora, (open)SUSE, Oracle etc (assuming those don't have rhel defined), so a larger change than only "exclude on RHEL >= 8

Provides: runc
%endif

Expand Down Expand Up @@ -69,15 +69,6 @@ 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}
BuildRequires: libbtrfs-devel
%else
BuildRequires: btrfs-progs-devel
%endif
%endif
Comment on lines -72 to -79
Copy link
Member

@thaJeztah thaJeztah Apr 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is correct; I think the intent here was to

  • include libbtrfs-devel on centos / rhel 7 (which still had btrfs?), and Fedora (?)
  • include btrfs-progs-devel on SUSE flavours (which default to using BTRFS as filesystem)

If I'm reading the current changes correctly, we're now excluding btrfs on all RPM variants (not just RHEL/CentOS > 7

Copy link
Contributor Author

@Romain-Geissler-1A Romain-Geissler-1A Apr 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the removal of all this related to btrfs is linked not to these "ifs", but to another one further down:

%if 1%{!?el8:1}
BUILDTAGS="${BUILDTAGS} no_btrfs"
%endif

This "if" expression can only expand to a "true" value, so my understanding is that right now, we always build with flag "no_btrfs", no matter which distro is being used. Assuming that btrfs was never used, I also removed all dependency on btrfs build requires packages.


%{?systemd_requires}

%description
Expand Down Expand Up @@ -108,10 +99,7 @@ cd %{_topdir}/BUILD/
cd %{_topdir}/BUILD
GO111MODULE=auto make man

BUILDTAGS="seccomp selinux"
%if 1%{!?el8:1}
BUILDTAGS="${BUILDTAGS} no_btrfs"
%endif
BUILDTAGS="seccomp selinux no_btrfs"

GO111MODULE=auto make -C /go/src/%{import_path} VERSION=%{getenv:VERSION} REVISION=%{getenv:REF} PACKAGE=%{getenv:PACKAGE} BUILDTAGS="${BUILDTAGS}"

Expand Down