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

[release/1.6 backport] rpm: minimal RHEL support #356

Open
wants to merge 3 commits into
base: release/1.6
Choose a base branch
from
Open

[release/1.6 backport] rpm: minimal RHEL support #356

wants to merge 3 commits into from

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 10, 2024 •
edited
Loading

@thaJeztah thaJeztah self-assigned this Jul 22, 2024
@thaJeztah thaJeztah changed the title [release/1.6] RHEL PoC [release/1.6 backport] rpm: minimal RHEL support Jul 23, 2024
@thaJeztah thaJeztah marked this pull request as ready for review July 23, 2024 18:37
thaJeztah and others added 2 commits July 25, 2024 07:37
@thaJeztah @neersighted
Makefile: add registry.access.redhat.com to known registries
fde63a3 
Co-authored-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6702eea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@neersighted @thaJeztah
Make build ARCH-aware
94d22d1 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
(cherry picked from commit 58d04e2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah requested a review from vvoland July 25, 2024 05:37
@thaJeztah
Copy link
Member Author

Wait; why is this failing on btrfs?

#27 20.24 + man/containerd.8
#27 20.24 go run -mod=readonly  cmd/gen-manpages/main.go containerd.8 man
#27 21.23 + man/containerd-config.8
#27 21.23 go-md2man -in "docs/man/containerd-config.8.md" -out "man/containerd-config.8"
#27 21.23 + man/containerd-config.toml.5
#27 21.23 go-md2man -in "docs/man/containerd-config.toml.5.md" -out "man/containerd-config.toml.5"
#27 21.24 WARNING: go-md2man does not handle node type HTMLBlock
#27 21.24 + man
#27 21.24 + BUILDTAGS=
#27 21.24 + GO111MODULE=auto
#27 21.24 + make -C /go/src/github.com/containerd/containerd VERSION=0.20240725.000514~d157b85 REVISION=d157b8583cf797c42c13c20845c4608a889ae2e1 PACKAGE=containerd.io BUILDTAGS=
#27 21.24 make: Entering directory '/go/src/github.com/containerd/containerd'
#27 21.30 + bin/ctr
#27 36.12 + bin/containerd
#27 41.20 # github.com/containerd/btrfs
#27 41.20 vendor/github.com/containerd/btrfs/btrfs.go:21:10: fatal error: btrfs/ioctl.h: No such file or directory
#27 41.20    21 | #include <btrfs/ioctl.h>
#27 41.20       |          ^~~~~~~~~~~~~~~
#27 41.20 compilation terminated.
#27 47.83 make: *** [Makefile:254: bin/containerd] Error 1
#27 47.83 make: Leaving directory '/go/src/github.com/containerd/containerd'
#27 47.83 error: Bad exit status from /var/tmp/rpm-tmp.p74w7K (%build)
#27 47.83     line 40: It's not recommended to have unversioned Obsoletes: Obsoletes: containerd
#27 47.83     line 41: It's not recommended to have unversioned Obsoletes: Obsoletes: runc
#27 47.83     Bad exit status from /var/tmp/rpm-tmp.p74w7K (%build)
#27 47.83 
#27 47.83 RPM build warnings:
#27 47.83 
#27 47.83 RPM build errors:
#27 ERROR: process "/bin/sh -c /root/build-rpm" did not complete successfully: exit code: 1

@neersighted @thaJeztah
rpm: minimal RHEL support
00b0083 
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 29bfe29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vvoland vvoland Awaiting requested review from vvoland

Assignees

@thaJeztah thaJeztah

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thaJeztah @neersighted