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.

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

Follow up on documentation links, and revise Solaris/illumos packaging aids #2743

Merged
merged 21 commits into from
Jan 3, 2025

Conversation

jimklimov
Copy link
Member

Several fixes for #2733 (for #722) regarding Solaris SMF syntax, completing that issue.

During work on that, realized that e.g. OpenIndiana packaging has to maintain patch-files that replace man page titles and cross-links with section code 1m where 8 is used (System mgmt programs), which is unwieldy as man pages change between releases in both content and population. Now the configure script and Makefile mesh allow to customize this right away, impacting both man page file names and the linkman:name[section] references; the resulting section name references from pre-installed service manifest templates as well as additions generated at run-time (NDE wrapped drivers) and reported in usage/help messages would use the system-specific value. Also the NUT path to man pages is used per packaging, not hard-coding.

During local testing of the package and services, a number of other issues were found and fixed, notably about making the ISA (64/32-bitness) more visible.

jimklimov and others added 15 commits December 30, 2024 10:02
…be consistent

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…entation links [networkupstools#722]

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…DE script launch

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
… the SEMVER part

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
… CPU support) of installation host vs. build target host

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…U support) of build target host in package naming

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…Link() for actual SMF command syntax [networkupstools#722]

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
… section names

Certain distributions have to patch built NUT artifacts
for their packaging with their man page sectioning standards.
Make life easier, be friendlier out of the box :)

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov@gmail.com>
… to provide corrected man page sections where needed

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…ripts/systemd/nut*.in, scripts/Solaris/*.xml.in: when suggesting man pages for further reading, refer to correct (configurable) section identifier [networkupstools#722]

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…ts/Solaris/*.xml.in: when suggesting man pages in service metadata, refer to packaged NUT_MANDIR [networkupstools#722]

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
@jimklimov jimklimov added packaging documentation systemd CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) Solaris/illumos Solaris and illumos systems (OpenIndiana, OmniOS, SmartOS, TribbliX...) portability We want NUT to build and run everywhere possible labels Dec 30, 2024
@jimklimov jimklimov added this to the 2.8.3 milestone Dec 30, 2024
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov marked this pull request as draft January 1, 2025 23:36
…ble doc building by themselves

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…e builds with Sun make: handle plain filenames in $(PREP_SRC) without a prefixed directory

Looking at generated docinfo.xml and linkman-* files respectively.

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…e builds: only rewrite "linkman" references for doc text sources that have them [networkupstools#722]

Spare asciidoc.conf, docinfo.xml and similar resource files,
as well as docs that do not have those tags in the first place.

Signed-off-by: Jim Klimov <jimklimov@gmail.com>
@jimklimov jimklimov marked this pull request as ready for review January 2, 2025 13:49
@AppVeyorBot
Copy link

@AppVeyorBot
Copy link

…h different MKDIR_P as we "cd" around [networkupstools#722]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov merged commit 6cd2c90 into networkupstools:master Jan 3, 2025
30 checks passed
@jimklimov jimklimov deleted the fix-pkg-sol branch January 3, 2025 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) documentation packaging portability We want NUT to build and run everywhere possible Solaris/illumos Solaris and illumos systems (OpenIndiana, OmniOS, SmartOS, TribbliX...) systemd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants