doc: Prebundle docs on RHEL & CentOS #22693
Merged
+36
−12
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Venefilyn
added
the
no-test
Venefilyn
force-pushed
the
doc/prebundle-on-rhel
branch
5 times, most recently
from
27b7c65 to
5a641eb
Compare
Member
Author
|
@martinpitt any hints as to how this works so we can build the docs with AsciiDoctor for RHEL and CentOS Stream without having to rely on asciidoc-py? |
Venefilyn
force-pushed
the
doc/prebundle-on-rhel
branch
from
5a641eb to
469be64
Compare
Member
Author
|
Stream likely fails due to error: Bad exit status from /var/tmp/rpm-tmp.zbhJ8p (%build)
Macro expanded in comment on line 31: %{centos} explicitly
Bad exit status from /var/tmp/rpm-tmp.zbhJ8p (%build)
RPM build errors: |
martinpitt
requested changes
Jan 7, 2026
Member
martinpitt
left a comment
martinpitt
left a comment
There was a problem hiding this comment.
Thanks! I included the solution to the failed CentOS builds in a thread.
Venefilyn
force-pushed
the
doc/prebundle-on-rhel
branch
from
469be64 to
3b442d4
Compare
Venefilyn
force-pushed
the
doc/prebundle-on-rhel
branch
from
3b442d4 to
3674ecf
Compare
Member
Author
|
/packit build |
martinpitt
removed
the
no-test
martinpitt
force-pushed
the
doc/prebundle-on-rhel
branch
2 times, most recently
from
90647fd to
7f38fce
Compare
Member
|
@Venefilyn I took the liberty to update this PR. I fixed the installation in the spec file, and also took care of the missing manpages. Now |
martinpitt
force-pushed
the
doc/prebundle-on-rhel
branch
from
7f38fce to
7a17a65
Compare
Member
|
jajaja. Fixed, and took the opportunity to clean lintian a bit. |
martinpitt
force-pushed
the
doc/prebundle-on-rhel
branch
from
7a17a65 to
b284b98
Compare
With this we can get rid of asciidoc-py dependency altogether and instead rely on the docs being prebundled before installation. Include the built guide and manpages into the release tarball for that. Fixes cockpit-project#22670 https://issues.redhat.com/browse/COCKPIT-1370 Signed-off-by: Freya Gustavsson <[email protected]> Co-Authored-By: Martin Pitt <[email protected]>
These don't apply any more with the move from docbook to asciidoc. Fixes three "unused-override" lintian infos.
martinpitt
force-pushed
the
doc/prebundle-on-rhel
branch
from
b284b98 to
fd1911e
Compare
Member
|
Updated the commit message to include refs to the upstream issue and Jira ticket. |
martinpitt
approved these changes
Jan 8, 2026
Member
martinpitt
left a comment
martinpitt
left a comment
There was a problem hiding this comment.
Thanks @Venefilyn ! LGTM now. As I meddled with this PR, can you please cross-check and land if you are happy?
Venefilyn
commented
Jan 8, 2026
Comment on lines
+222
to
+230
| %define manbundledir %{_builddir}/%{name}-%{version}/doc/output/man | ||
| install -D -p -m 644 %{manbundledir}/cockpit.1 %{buildroot}%{_mandir}/man1/cockpit.1 | ||
| install -D -p -m 644 %{manbundledir}/cockpit-bridge.1 %{buildroot}%{_mandir}/man1/cockpit-bridge.1 | ||
| install -D -p -m 644 %{manbundledir}/cockpit-desktop.1 %{buildroot}%{_mandir}/man1/cockpit-desktop.1 | ||
| install -D -p -m 644 %{manbundledir}/cockpit.conf.5 %{buildroot}%{_mandir}/man5/cockpit.conf.5 | ||
| install -D -p -m 644 %{manbundledir}/cockpit-ws.8 %{buildroot}%{_mandir}/man8/cockpit-ws.8 | ||
| install -D -p -m 644 %{manbundledir}/cockpit-tls.8 %{buildroot}%{_mandir}/man8/cockpit-tls.8 | ||
| install -D -p -m 644 %{manbundledir}/pam_ssh_add.8 %{buildroot}%{_mandir}/man8/pam_ssh_add.8 | ||
| %endif |
Member
Author
There was a problem hiding this comment.
Is it possible for us to iterate over files and install? Or install all files somehow
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this we can get rid of asciidoc-py dependency altogether and
instead rely on the docs being prebundled before installation.
Fixes #22670
https://issues.redhat.com/browse/COCKPIT-1370
Signed-off-by: Freya Gustavsson [email protected]