Skip to content

Build adjustments needed for newer rpm-based platforms (3.21)#2022

Merged
craigcomstock merged 3 commits into
cfengine:3.21.xfrom
craigcomstock:ent-13016/3.21
Nov 5, 2025
Merged

Build adjustments needed for newer rpm-based platforms (3.21)#2022
craigcomstock merged 3 commits into
cfengine:3.21.xfrom
craigcomstock:ent-13016/3.21

Conversation

@craigcomstock

@craigcomstock craigcomstock commented Nov 4, 2025

Copy link
Copy Markdown
Contributor
  • Adjusted apache patch spec file for newer Patch N style
  • Removed not needed libtool control la files in dependencies
  • Adjusted rpm deps and packaging to allow /var/cfengine/lib as an RPATH entry

together
cfengine/core#5933
#2022

Ticket: ENT-13016
Changelog: none
(cherry picked from commit 614f9dc)
(cherry picked from commit 2d0cfda)
Ticket: ENT-13016
Changelog: none
(cherry picked from commit 6fc52e4)
(cherry picked from commit 54cd4b1)
…H entry

Adjusted rpm packaging to allow empty manifest lists such as debug symbols

Some dependencies don't generate symbols even when BUILD_TYPE=DEBUG aka with_debugsym 0 and __strip /bin/true as options to rpmbuild.

Ticket: ENT-13016
Changelog: none
(cherry picked from commit 920d739)

 Conflicts:
	build-scripts/package
	deps-packaging/pkg-build-rpm

Removed some docs/debugs from master and KEPT system_ssl option here as our openssl is too different in 3.24.x from distributions we build for and causes conflicts in libraries, e.g. ENT-12528

(cherry picked from commit 2a4b6c1)
@craigcomstock craigcomstock changed the title Build adjustments needed for newer rpm-based platforms Build adjustments needed for newer rpm-based platforms (3.21) Nov 4, 2025
@craigcomstock

Copy link
Copy Markdown
Contributor Author

@cf-bottom jenkins with exotics

@cf-bottom

Copy link
Copy Markdown

@craigcomstock craigcomstock marked this pull request as ready for review November 5, 2025 15:11
@craigcomstock craigcomstock merged commit 5e9d4ae into cfengine:3.21.x Nov 5, 2025
37 of 39 checks passed
@craigcomstock craigcomstock deleted the ent-13016/3.21 branch November 5, 2025 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants