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

Restructure packaging related files to better reflect usage. #17678

Merged
merged 3 commits into from
May 30, 2024

Conversation

Ferroin
Copy link
Member

@Ferroin Ferroin commented May 16, 2024

Summary

This is prep-work for eventual CPack RPM support.

The idea here is to group files used for packaging based on the packaging infrastructure they are used for and clearly organize them under a specific hierarchy within the CMake files.

This should be a non-semantic change, with no functional change in behavior for either the build process or end users.

Test Plan

CI passes on this PR.

@github-actions github-actions bot added area/packaging Packaging and operating systems support area/build Build system (autotools and cmake). labels May 16, 2024
@Ferroin Ferroin marked this pull request as ready for review May 16, 2024 13:41
@Ferroin Ferroin requested review from vkalintiris and a team as code owners May 16, 2024 13:41
@@ -9,6 +9,8 @@ set(CPACK_DEBIAN_DEBUGINFO_PACKAGE NO)

set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)

set(PKG_FILES "${CMAKE_SOURCE_DIR}/packaging/cmake/pkg-files")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not really needed, is it? I think can use a single definition from the main CMakeLists.txt file.

Copy link
Member Author

Choose a reason for hiding this comment

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

It probably isn’t needed, I just kind of forgot it was there. In the the initial version of this change I had forgotten to modify the main CMakeLists file, and when I fixed that I forgot to remove this line in the packaging file. I’ll update the PR to exclude it.

@Ferroin
Copy link
Member Author

Ferroin commented May 30, 2024

Rebased to resolve merge conflict.

@Ferroin Ferroin merged commit 78fcd81 into netdata:master May 30, 2024
145 of 146 checks passed
@Ferroin Ferroin deleted the pkg-files-migration branch May 30, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Build system (autotools and cmake). area/packaging Packaging and operating systems support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants