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

Fix rpm and deb package name format #6468

Conversation

Smjert
Copy link
Member

@Smjert Smjert commented May 28, 2020

By using RPM-DEFAULT and DEB-DEFAULT as package names,
CPack leaves the naming of the packages to the underlying
packaging tools which will use the standard naming format.

Fixes #6074

By using RPM-DEFAULT and DEB-DEFAULT as package names,
CPack leaves the naming of the packages to the underlying
packaging tools which will use the standard naming format.
@theopolis
Copy link
Member

Wow! Good find!

@theopolis theopolis merged commit 11bdf32 into osquery:master May 28, 2020
@Smjert
Copy link
Member Author

Smjert commented May 28, 2020

Wow! Good find!

Yeah it was in the CMake docs afterall: https://cmake.org/cmake/help/v3.17/cpack_gen/rpm.html#variable:CPACK_RPM_%3Ccomponent%3E_FILE_NAME

This may be set to RPM-DEFAULT to allow rpmbuild tool to generate package file name by itself. Alternatively provided package file name must end with .rpm suffix.

and

https://cmake.org/cmake/help/v3.17/cpack_gen/deb.html?highlight=cpack%20deb#variable:CPACK_DEBIAN_%3CCOMPONENT%3E_FILE_NAME

This may be set to DEB-DEFAULT to allow the CPack DEB generator to generate package file name by itself in deb format:

<PackageName>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb

But I didn't notice until now ^^'
Although it doesn't mention the ddeb case, the result seemed the correct one.

@Smjert Smjert deleted the stefano/packaging/fix-rpm-deb-package-names branch June 26, 2020 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cpack: Package naming nitpicks (corrections)
2 participants